From ff7a169d9847eebe2cee717c662880e83c7559b5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 27 Mar 2009 09:40:15 +0000 Subject: Make the argument hash in config.setcpv() a little stronger. svn path=/main/trunk/; revision=13232 --- 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 771e720d3..e2328edab 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2086,16 +2086,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