summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-08-27 10:57:01 +0000
committerZac Medico <zmedico@gentoo.org>2006-08-27 10:57:01 +0000
commit00e5dfccca4b2c6bb683f5b2820fce4b9613eea5 (patch)
tree540c27d12ba27a91e3443d61082b8761e6fc954a
parent104787f9d9092fdd15625cb05acaeb084eddce69 (diff)
downloadportage-00e5dfccca4b2c6bb683f5b2820fce4b9613eea5.tar.gz
portage-00e5dfccca4b2c6bb683f5b2820fce4b9613eea5.tar.bz2
portage-00e5dfccca4b2c6bb683f5b2820fce4b9613eea5.zip
Display flags that have been removed from IUSE as (-flag%) instead of !flag% and display newly added masked flags without the % symbol in order to avoid ambiguity. See bug #144661.
svn path=/main/trunk/; revision=4350
-rwxr-xr-xbin/emerge7
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 9d6b8fa63..5e8e0fabc 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1346,16 +1346,19 @@ class depgraph:
flag_str = green(flag) + "*"
elif flag in removed_iuse:
if all_flags:
- flag_str = yellow("!" + flag) + "%"
+ flag_str = yellow("-" + flag) + "%"
if flag in old_use:
flag_str += "*"
+ flag_str = "(" + flag_str + ")"
removed.append(flag_str)
continue
else:
if is_new or flag in old_iuse and flag not in old_use and all_flags:
flag_str = blue("-" + flag)
elif flag not in old_iuse:
- flag_str = yellow("-" + flag) + "%"
+ flag_str = yellow("-" + flag)
+ if flag not in iuse_forced:
+ flag_str += "%"
elif flag in old_use:
flag_str = green("-" + flag) + "*"
if flag_str: