diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2011-09-21 14:23:44 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-21 07:00:35 -0700 |
| commit | 5f3826d1b1a82f4e0b2c2ffdb663e8b785d7e7fa (patch) | |
| tree | ef3c292ecaefb2e9a0405c240137da35552481af /pym/_emerge/depgraph.py | |
| parent | 6cea2091526659521d35be6c8dc7733f69f1a760 (diff) | |
| download | portage-5f3826d1b1a82f4e0b2c2ffdb663e8b785d7e7fa.tar.gz portage-5f3826d1b1a82f4e0b2c2ffdb663e8b785d7e7fa.tar.bz2 portage-5f3826d1b1a82f4e0b2c2ffdb663e8b785d7e7fa.zip | |
autounmask: Always use unresticted atoms for license and USE changes
See bug 379333.
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 8b2bfd378..ffa7e167e 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)))) |