| 1 |
commit: d0c628f34a1789e3fc9e41c2cbc69926e8ada7b9 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 30 02:09:46 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 30 02:09:46 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d0c628f3 |
| 7 |
|
| 8 |
config.setcpv(): simplify repo_env code |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/package/ebuild/config.py | 6 ++---- |
| 12 |
1 files changed, 2 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 15 |
index 19277d7..d553a7b 100644 |
| 16 |
--- a/pym/portage/package/ebuild/config.py |
| 17 |
+++ b/pym/portage/package/ebuild/config.py |
| 18 |
@@ -1127,7 +1127,6 @@ class config(object): |
| 19 |
has_changed = True |
| 20 |
|
| 21 |
repo_env = [] |
| 22 |
- repo_env_empty = True |
| 23 |
if repository and repository != Package.UNKNOWN_REPO: |
| 24 |
repos = [] |
| 25 |
try: |
| 26 |
@@ -1146,7 +1145,6 @@ class config(object): |
| 27 |
d = d.copy() |
| 28 |
for k in self._global_only_vars: |
| 29 |
d.pop(k, None) |
| 30 |
- repo_env.append(d) |
| 31 |
cpdict = self._use_manager._repo_puse_dict.get(repo, {}).get(cp) |
| 32 |
if cpdict: |
| 33 |
repo_puse = ordered_by_atom_specificity(cpdict, pkg) |
| 34 |
@@ -1154,9 +1152,9 @@ class config(object): |
| 35 |
for x in repo_puse: |
| 36 |
d["USE"] = d.get("USE", "") + " " + " ".join(x) |
| 37 |
if d: |
| 38 |
- repo_env_empty = False |
| 39 |
+ repo_env.append(d) |
| 40 |
|
| 41 |
- if not repo_env_empty or self.configdict["repo"]: |
| 42 |
+ if repo_env or self.configdict["repo"]: |
| 43 |
self.configdict["repo"].clear() |
| 44 |
self.configdict["repo"].update(stack_dicts(repo_env, |
| 45 |
incrementals=self.incrementals)) |
Archives