From 2ac8372b640b10bd649e7ff618ae2f0f3e294b76 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Wed, 1 Mar 2006 19:37:48 +0000 Subject: Fix up logging in dryrun mode git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1785 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Toolset.py | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'src/lib/Client/Toolset.py') diff --git a/src/lib/Client/Toolset.py b/src/lib/Client/Toolset.py index 0a6022383..067f50926 100644 --- a/src/lib/Client/Toolset.py +++ b/src/lib/Client/Toolset.py @@ -501,18 +501,23 @@ class Toolset(object): self.HandleExtra() if self.setup['dryrun']: - self.logger.info("Packages to update:") - self.logger.info([pkg.get('name') for pkg in self.pkgwork['update']]) - self.logger.info("Packages to add:") - self.logger.info([pkg.get('name') for pkg in self.pkgwork['add']]) - self.logger.info("Packages to remove:") - self.logger.info(self.pkgwork['remove']) - self.logger.info("Entries to update:") - self.logger.info(["%s: %s" % (entry.tag, entry.get('name')) - for entry in self.states if not (self.states[entry] - or entry.tag == 'Package')]) - self.logger.info("Services to remove:") - self.logger.info(self.extra_services) + if self.pkgwork['update']: + self.logger.info("Packages to update:") + self.logger.info([pkg.get('name') for pkg in self.pkgwork['update']]) + if self.pkgwork['add']: + self.logger.info("Packages to add:") + self.logger.info([pkg.get('name') for pkg in self.pkgwork['add']]) + if self.pkgwork['remove']: + self.logger.info("Packages to remove:") + self.logger.info(self.pkgwork['remove']) + if [entry for entry in self.states if not (self.states[entry] or entry.tag == 'Package')]: + self.logger.info("Entries to update:") + self.logger.info(["%s: %s" % (entry.tag, entry.get('name')) + for entry in self.states if not (self.states[entry] + or entry.tag == 'Package')]) + if self.extra_services: + self.logger.info("Services to remove:") + self.logger.info(self.extra_services) return # use quick package ops from here on -- cgit v1.2.3-1-g7c22