From a5f2babaf3ba298cac7f9babdf9b568f26d71a58 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 25 Apr 2013 09:04:08 -0500 Subject: Frame: Left-align entries without a type Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Client/Frame.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/Bcfg2/Client/Frame.py') diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py index be5c37004..850e58d9d 100644 --- a/src/lib/Bcfg2/Client/Frame.py +++ b/src/lib/Bcfg2/Client/Frame.py @@ -458,8 +458,8 @@ class Frame(object): self.logger.info("%s:%s:%s" % (entry.tag, etype, entry.get('name'))) else: - self.logger.info(" %s:%s" % (entry.tag, - entry.get('name'))) + self.logger.info("%s:%s" % (entry.tag, + entry.get('name'))) self.logger.info('Total managed entries: %d' % len(list(self.states.values()))) self.logger.info('Unmanaged entries: %d' % len(self.extra)) @@ -471,8 +471,8 @@ class Frame(object): self.logger.info("%s:%s:%s" % (entry.tag, etype, entry.get('name'))) else: - self.logger.info(" %s:%s" % (entry.tag, - entry.get('name'))) + self.logger.info("%s:%s" % (entry.tag, + entry.get('name'))) if ((list(self.states.values()).count(False) == 0) and not self.extra): self.logger.info('All entries correct.') -- cgit v1.2.3-1-g7c22 From 5852f61bc3b07d987f28d016dde9475eece5ba86 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 10 May 2013 15:31:29 -0500 Subject: Frame: Print the bundle name (not Element) Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Client/Frame.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/Client/Frame.py') diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py index 850e58d9d..7c998275e 100644 --- a/src/lib/Bcfg2/Client/Frame.py +++ b/src/lib/Bcfg2/Client/Frame.py @@ -418,10 +418,11 @@ class Frame(object): # prune out unspecified bundles when running with -b continue if bundle in mbundles: - self.logger.debug("Bundle %s was modified" % bundle) + self.logger.debug("Bundle %s was modified" % bundle.get('name')) func = "BundleUpdated" else: - self.logger.debug("Bundle %s was not modified" % bundle) + self.logger.debug("Bundle %s was not modified" % + bundle.get('name')) func = "BundleNotUpdated" for tool in self.tools: try: -- cgit v1.2.3-1-g7c22 From 0a109b0a4331acbf07d6b3452767b84285edb5e9 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 10 May 2013 14:16:21 -0400 Subject: fixed bundle names in debugging output --- src/lib/Bcfg2/Client/Frame.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Client/Frame.py') diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py index 7c998275e..e7f9b401e 100644 --- a/src/lib/Bcfg2/Client/Frame.py +++ b/src/lib/Bcfg2/Client/Frame.py @@ -418,7 +418,8 @@ class Frame(object): # prune out unspecified bundles when running with -b continue if bundle in mbundles: - self.logger.debug("Bundle %s was modified" % bundle.get('name')) + self.logger.debug("Bundle %s was modified" % + bundle.get('name')) func = "BundleUpdated" else: self.logger.debug("Bundle %s was not modified" % -- cgit v1.2.3-1-g7c22 From 7b1a1e45641bc6283d9db3b0f76a7ca6bf6fc871 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 13 May 2013 10:07:14 -0500 Subject: Client: Fix interactive prompt Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Client/Frame.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/lib/Bcfg2/Client/Frame.py') diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py index e7f9b401e..b7c3f7145 100644 --- a/src/lib/Bcfg2/Client/Frame.py +++ b/src/lib/Bcfg2/Client/Frame.py @@ -9,14 +9,6 @@ from Bcfg2.Client import prompt from Bcfg2.Compat import any, all, cmp # pylint: disable=W0622 -def cmpent(ent1, ent2): - """Sort entries.""" - if ent1.tag != ent2.tag: - return cmp(ent1.tag, ent2.tag) - else: - return cmp(ent1.get('name'), ent2.get('name')) - - def matches_entry(entryspec, entry): """ Determine if the Decisions-style entry specification matches the entry. Both are tuples of (tag, name). The entryspec can @@ -155,7 +147,7 @@ class Frame(object): def promptFilter(self, msg, entries): """Filter a supplied list based on user input.""" ret = [] - entries.sort(cmpent) + entries.sort(key=lambda e: e.tag + ":" + e.get('name')) for entry in entries[:]: if entry in self.unhandled: # don't prompt for entries that can't be installed -- cgit v1.2.3-1-g7c22 From a715128dbafc0dec3fa82359128ed33d8d242c1d Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 13 May 2013 10:27:20 -0500 Subject: Frame: Remove unused import Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Client/Frame.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Client/Frame.py') diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py index b7c3f7145..d30708e83 100644 --- a/src/lib/Bcfg2/Client/Frame.py +++ b/src/lib/Bcfg2/Client/Frame.py @@ -6,7 +6,7 @@ import fnmatch import logging import Bcfg2.Client.Tools from Bcfg2.Client import prompt -from Bcfg2.Compat import any, all, cmp # pylint: disable=W0622 +from Bcfg2.Compat import any, all # pylint: disable=W0622 def matches_entry(entryspec, entry): -- cgit v1.2.3-1-g7c22