summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-12-21 14:57:20 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-12-21 14:57:20 +0000
commite0bc4ab7fee256bb6e772546359554e5de0ee986 (patch)
treeaa91492cb0722d68b905e68b85a06fb3655cb40f
parent49954c04d1e809419fd32bcc29f6bb51b8efcae6 (diff)
downloadportage-e0bc4ab7fee256bb6e772546359554e5de0ee986.tar.gz
portage-e0bc4ab7fee256bb6e772546359554e5de0ee986.tar.bz2
portage-e0bc4ab7fee256bb6e772546359554e5de0ee986.zip
Don't show enabled flags when not using --verbose if they haven't changed
since the last emerge. Show enabled flags in red rather than green if the previously merged package didn't support them. svn path=/main/trunk/; revision=2421
-rwxr-xr-xbin/emerge17
1 files changed, 8 insertions, 9 deletions
diff --git a/bin/emerge b/bin/emerge
index 41532406e..754ac9ad3 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1503,16 +1503,15 @@ class depgraph:
enabled = []
disabled = []
for flag in cur_iuse:
- if flag in cur_use:
- if flag in old_use:
- enabled.append(red(flag))
- else:
+ if flag in cur_use and flag not in old_use:
+ if flag in old_iuse:
enabled.append(green(flag)+"*")
- else:
- if flag in old_use:
- disabled.append(green("-"+flag)+"*")
- elif is_new or flag not in old_iuse:
- disabled.append(blue("-"+flag))
+ else:
+ enabled.append(red(flag))
+ elif flag not in cur_use and flag in old_use:
+ disabled.append(green("-"+flag)+"*")
+ elif is_new:
+ disabled.append(blue("-"+flag))
enabled = " ".join(enabled)
disabled = " ".join(disabled)
if enabled and disabled: