From b7e40a3a49bf79eaebc368574d4c49a78b5afc67 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 27 Mar 2009 09:40:37 +0000 Subject: Make the argument hash in config.setcpv() a little stronger. (trunk r13232) svn path=/main/branches/2.1.6/; revision=13233 --- pym/portage/__init__.py | 12 +++++++----- 1 file 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 -- cgit v1.2.3-1-g7c22