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

diff --git a/bin/emerge b/bin/emerge
index 41532406e0ae8a1434a71479eb9be6684630f497..754ac9ad30506ed7a8cccbdc231c0e9c65cb851a 100755 (executable)
--- 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: