summaryrefslogtreecommitdiffstats
path: root/src/lib/Client/Debian.py
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-03-09 20:23:35 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-03-09 20:23:35 +0000
commit5e494a8be31724d0b2f990f60337c83e545d4c1e (patch)
tree89aa1e4b25395b776a41a77d2c33f91fc5e925cc /src/lib/Client/Debian.py
parent40c0c342fcdd1cea0b9b8972ea539d7368b85f82 (diff)
downloadbcfg2-5e494a8be31724d0b2f990f60337c83e545d4c1e.tar.gz
bcfg2-5e494a8be31724d0b2f990f60337c83e545d4c1e.tar.bz2
bcfg2-5e494a8be31724d0b2f990f60337c83e545d4c1e.zip
* Remove messages describing extra configuration elements when running in bundle mode
* Handle garbage filenames in Cfg more gracefully git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1799 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client/Debian.py')
-rw-r--r--src/lib/Client/Debian.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/Client/Debian.py b/src/lib/Client/Debian.py
index 7b915edc4..72a47a82f 100644
--- a/src/lib/Client/Debian.py
+++ b/src/lib/Client/Debian.py
@@ -124,8 +124,9 @@ class ToolsetImpl(Bcfg2.Client.Toolset.Toolset):
if not self.saferun("apt-get remove -y --force-yes %s" % " ".join(self.pkgwork['remove']))[0]:
self.pkgwork['remove'] = []
else:
- self.logger.info("Need to remove packages:")
- self.logger.info(self.pkgwork['remove'])
+ if not self.setup['bundle']:
+ self.logger.info("Need to remove packages:")
+ self.logger.info(self.pkgwork['remove'])
if len(self.extra_services) > 0:
if self.setup['remove'] in ['all', 'services']:
@@ -134,6 +135,7 @@ class ToolsetImpl(Bcfg2.Client.Toolset.Toolset):
[self.extra_services.remove(serv) for serv in self.extra_services if
not self.saferun("rm -f /etc/rc*.d/S??%s" % serv)[0]]
else:
- self.logger.info('Need to remove services:')
- self.logger.info(self.extra_services)
+ if not self.setup['bundle']:
+ self.logger.info('Need to remove services:')
+ self.logger.info(self.extra_services)