summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-07-28 19:08:59 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-07-28 19:08:59 +0000
commit6b649c0046395b7eb64e8e24d3433ee10dff2409 (patch)
tree94ce52f66063cf8f1dd29cbf0f06ac413f95bec1
parente15cfbee1ca7d29028a2417692da2840d040dfab (diff)
downloadbcfg2-6b649c0046395b7eb64e8e24d3433ee10dff2409.tar.gz
bcfg2-6b649c0046395b7eb64e8e24d3433ee10dff2409.tar.bz2
bcfg2-6b649c0046395b7eb64e8e24d3433ee10dff2409.zip
Change extra entries messages to be less scary
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2011 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Client/Debian.py4
-rw-r--r--src/lib/Client/Redhat.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Client/Debian.py b/src/lib/Client/Debian.py
index 2bee81cbb..2ad28f08f 100644
--- a/src/lib/Client/Debian.py
+++ b/src/lib/Client/Debian.py
@@ -132,7 +132,7 @@ class ToolsetImpl(Bcfg2.Client.Toolset.Toolset):
self.pkgwork['remove'] = []
else:
if not self.setup['bundle']:
- self.logger.info("Need to remove packages:")
+ self.logger.info("Found extra packages:")
self.logger.info(self.pkgwork['remove'])
if len(self.extra_services) > 0:
@@ -143,6 +143,6 @@ class ToolsetImpl(Bcfg2.Client.Toolset.Toolset):
not self.saferun("rm -f /etc/rc*.d/S??%s" % serv)[0]]
else:
if not self.setup['bundle']:
- self.logger.info('Need to remove services:')
+ self.logger.info('Found extra active services:')
self.logger.info(self.extra_services)
diff --git a/src/lib/Client/Redhat.py b/src/lib/Client/Redhat.py
index 5f99eecae..f367e3315 100644
--- a/src/lib/Client/Redhat.py
+++ b/src/lib/Client/Redhat.py
@@ -141,7 +141,7 @@ class ToolsetImpl(Toolset):
self.Refresh()
self.Inventory()
else:
- self.logger.info("Need to remove packages:")
+ self.logger.info("Found extra packages:")
self.logger.info(self.pkgwork['remove'])
if len(self.extra_services) > 0:
if self.setup['remove'] in ['all', 'services']:
@@ -152,7 +152,7 @@ class ToolsetImpl(Toolset):
self.extra_services.remove(service)
self.logger.info("Failed to remove service %s" % (service))
else:
- self.logger.info('Need to remove services:')
+ self.logger.info('Found extra active services:')
self.logger.info(self.extra_services)
def Inventory(self):