diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-27 09:40:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-27 09:40:37 +0000 |
| commit | b7e40a3a49bf79eaebc368574d4c49a78b5afc67 (patch) | |
| tree | 3ad019257813e9717e4d964a8203d0d9bd9fefd7 | |
| parent | e21f4cb89864786cc4f2082d9dd4595a9c0e55df (diff) | |
| download | portage-b7e40a3a49bf79eaebc368574d4c49a78b5afc67.tar.gz portage-b7e40a3a49bf79eaebc368574d4c49a78b5afc67.tar.bz2 portage-b7e40a3a49bf79eaebc368574d4c49a78b5afc67.zip | |
Make the argument hash in config.setcpv() a little stronger. (trunk r13232)v2.1.6.11
svn path=/main/branches/2.1.6/; revision=13233
| -rw-r--r-- | pym/portage/__init__.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index b209fe657..5df90ab7e 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2076,16 +2076,18 @@ class config(object): self.modifying() - args_hash = (id(mycpv), id(mydb)) - if args_hash == self._setcpv_args_hash: - return - self._setcpv_args_hash = args_hash - pkg = None if not isinstance(mycpv, basestring): pkg = mycpv mycpv = pkg.cpv mydb = pkg.metadata + args_hash = (mycpv, id(pkg)) + else: + args_hash = (mycpv, id(mydb)) + + if args_hash == self._setcpv_args_hash: + return + self._setcpv_args_hash = args_hash has_changed = False self.mycpv = mycpv |