summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Luther2011-09-21 12:23:44 (GMT)
committerZac Medico2011-09-21 14:00:35 (GMT)
commit5f3826d1b1a82f4e0b2c2ffdb663e8b785d7e7fa (patch)
treeef3c292ecaefb2e9a0405c240137da35552481af
parent6cea2091526659521d35be6c8dc7733f69f1a760 (diff)
autounmask: Always use unresticted atoms for license and USE changes
See bug 379333.
-rw-r--r--man/emerge.17
-rw-r--r--pym/_emerge/depgraph.py22
-rw-r--r--pym/_emerge/help.py7
3 files changed, 16 insertions, 20 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index 72b5569..6d9ce4c 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -305,9 +305,10 @@ the specified configuration file(s), or enable the
disable this option by default in \fBmake.conf\fR(5).
.TP
.BR "\-\-autounmask\-unrestricted\-atoms [ y | n ]"
-If \-\-autounmask is enabled, changes using the \'=\' operator
-will be written. With this option, \'>=\' operators will be used
-whenever possible.
+If \-\-autounmask is enabled, keyword and mask changes
+using the \'=\' operator will be written. With this
+option, \'>=\' operators will be used whenever possible.
+USE and license changes always use the latter behvior.
.TP
.BR "\-\-autounmask\-keep\-masks [ y | n ]"
If \-\-autounmask is enabled, no package.unmask or ** keyword changes
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 8b2bfd3..ffa7e16 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5848,13 +5848,10 @@ class depgraph(object):
else:
adjustments.append("-" + flag)
use_changes_msg[root].append(self._get_dep_chain_as_comment(pkg, unsatisfied_dependency=True))
- if autounmask_unrestricted_atoms:
- if is_latest:
- use_changes_msg[root].append(">=%s %s\n" % (pkg.cpv, " ".join(adjustments)))
- elif is_latest_in_slot:
- use_changes_msg[root].append(">=%s:%s %s\n" % (pkg.cpv, pkg.metadata["SLOT"], " ".join(adjustments)))
- else:
- use_changes_msg[root].append("=%s %s\n" % (pkg.cpv, " ".join(adjustments)))
+ if is_latest:
+ use_changes_msg[root].append(">=%s %s\n" % (pkg.cpv, " ".join(adjustments)))
+ elif is_latest_in_slot:
+ use_changes_msg[root].append(">=%s:%s %s\n" % (pkg.cpv, pkg.metadata["SLOT"], " ".join(adjustments)))
else:
use_changes_msg[root].append("=%s %s\n" % (pkg.cpv, " ".join(adjustments)))
@@ -5868,13 +5865,10 @@ class depgraph(object):
is_latest, is_latest_in_slot = check_if_latest(pkg)
license_msg[root].append(self._get_dep_chain_as_comment(pkg))
- if autounmask_unrestricted_atoms:
- if is_latest:
- license_msg[root].append(">=%s %s\n" % (pkg.cpv, " ".join(sorted(missing_licenses))))
- elif is_latest_in_slot:
- license_msg[root].append(">=%s:%s %s\n" % (pkg.cpv, pkg.metadata["SLOT"], " ".join(sorted(missing_licenses))))
- else:
- license_msg[root].append("=%s %s\n" % (pkg.cpv, " ".join(sorted(missing_licenses))))
+ if is_latest:
+ license_msg[root].append(">=%s %s\n" % (pkg.cpv, " ".join(sorted(missing_licenses))))
+ elif is_latest_in_slot:
+ license_msg[root].append(">=%s:%s %s\n" % (pkg.cpv, pkg.metadata["SLOT"], " ".join(sorted(missing_licenses))))
else:
license_msg[root].append("=%s %s\n" % (pkg.cpv, " ".join(sorted(missing_licenses))))
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index e6828c0..7e73ec0 100644
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -325,9 +325,10 @@ def help(myopts, havecolor=1):
print()
print(" " + green("--autounmask-unrestricted-atoms") + " [ %s | %s ]" % \
(turquoise("y"), turquoise("n")))
- desc = "If --autounmask is enabled, changes using the '=' operator " + \
- "will be written. With this option, '>=' operators will be used " + \
- "whenever possible."
+ desc = "If --autounmask is enabled, keyword and mask changes" + \
+ "using the '=' operator will be written. With this option, " + \
+ "'>=' operators will be used whenever possible. USE and " + \
+ "license changes always use the latter behvior."
for line in wrap(desc, desc_width):
print(desc_indent + line)
print()