diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-08-03 09:01:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-08-03 09:01:33 +0000 |
| commit | 2d3be13790e411e3566a63d8d0ad0a36577bbb7d (patch) | |
| tree | 8d885ecbc990599dae92822fc1acf5d14fb505e5 | |
| parent | 67e1a4c0f734a8feb0973fda3564370bff4cd6ea (diff) | |
| download | portage-2d3be13790e411e3566a63d8d0ad0a36577bbb7d.tar.gz portage-2d3be13790e411e3566a63d8d0ad0a36577bbb7d.tar.bz2 portage-2d3be13790e411e3566a63d8d0ad0a36577bbb7d.zip | |
Instead of self.puse, use self.mycpv to return early from setcpv.
svn path=/main/trunk/; revision=4113
| -rw-r--r-- | pym/portage.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage.py b/pym/portage.py index 2a0f60c99..effe789d6 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1315,6 +1315,7 @@ class config: self.modifiedkeys = [] if not keeping_pkg: + self.mycpv = None self.puse = "" self.configdict["pkg"].clear() self.regenerate(use_cache=use_cache) @@ -1361,16 +1362,15 @@ class config: def setcpv(self,mycpv,use_cache=1): self.modifying() + if self.mycpv == mycpv: + return self.mycpv = mycpv cp = dep_getkey(mycpv) - newpuse = "" + self.puse = "" if self.pusedict.has_key(cp): self.pusekey = best_match_to_list(self.mycpv, self.pusedict[cp].keys()) if self.pusekey: - newpuse = string.join(self.pusedict[cp][self.pusekey]) - if newpuse == self.puse: - return - self.puse = newpuse + self.puse = " ".join(self.pusedict[cp][self.pusekey]) self.configdict["pkg"]["PKGUSE"] = self.puse[:] # For saving to PUSE file self.configdict["pkg"]["USE"] = self.puse[:] # this gets appended to USE # CATEGORY is essential for doebuild calls |