From 2148554f39500b36316d17c8406b3741f8b10c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozan=20=C3=87a=C4=9Flayan?= Date: Tue, 12 Apr 2011 06:43:05 +0000 Subject: [PATCH] cli/listavailable: Fix inconsistent coloring (pb#17716) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simplify code to fix the wrong coloring behaviour of pisi list-available command. Reported by: Anıl Özbek BUG:COMMENT:17716 --- pisi/cli/listavailable.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pisi/cli/listavailable.py b/pisi/cli/listavailable.py index 6d62c446..9da50e21 100644 --- a/pisi/cli/listavailable.py +++ b/pisi/cli/listavailable.py @@ -77,6 +77,7 @@ all repositories. return else: l = pisi.api.list_available(repo) + installed_list = pisi.api.list_installed() # maxlen is defined dynamically from the longest package name (#9021) @@ -85,19 +86,18 @@ all repositories. l.sort() for p in l: + if ctx.config.get_option('uninstalled') and p in installed_list: + continue + package = self.packagedb.get_package(p, repo) + + if p in installed_list: + package.name = util.colorize(package.name, 'green') + else: + package.name = util.colorize(package.name, 'brightwhite') + if self.options.long: - if p in installed_list: - package.name = util.colorize(package.name, 'green') - else: - package.name = util.colorize(package.name, 'brightwhite') ctx.ui.info(unicode(package)+'\n') else: - lenp = len(p) - if p in installed_list: - if ctx.config.get_option('uninstalled'): - continue - p = util.colorize(p, 'green') - p = util.colorize(p, 'brightwhite') - p = p + ' ' * max(0, maxlen - lenp) - ctx.ui.info('%s - %s ' % (p, unicode(package.summary))) + package.name += ' ' * max(0, maxlen - len(p)) + ctx.ui.info('%s - %s ' % (package.name, unicode(package.summary)))