aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Erdmann <dywi@mailerd.de>2013-08-01 14:30:46 +0200
committerAndré Erdmann <dywi@mailerd.de>2013-08-01 14:30:46 +0200
commit9b576fa2d1fc1b4b5c202793e8d5c2eafe079304 (patch)
treecfd7749fe1ff8d263841dd9a7dd6f556ba736d7a /roverlay/packageinfo.py
parentroverlay.py: remove "[python] -OO" (diff)
downloadR_overlay-9b576fa2d1fc1b4b5c202793e8d5c2eafe079304.tar.gz
R_overlay-9b576fa2d1fc1b4b5c202793e8d5c2eafe079304.tar.bz2
R_overlay-9b576fa2d1fc1b4b5c202793e8d5c2eafe079304.zip
roverlay/packageinfo: bind hashdict in __init__()
Diffstat (limited to 'roverlay/packageinfo.py')
-rw-r--r--roverlay/packageinfo.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/roverlay/packageinfo.py b/roverlay/packageinfo.py
index 25e67d9..752f996 100644
--- a/roverlay/packageinfo.py
+++ b/roverlay/packageinfo.py
@@ -134,6 +134,8 @@ class PackageInfo ( object ):
# self.selfdeps is a list of _mandatory_ selfdeps
self.selfdeps = None
+ self.hashdict = dict()
+
#self.selfdeps_valid = UNDEF
#self.overlay_package_ref = None
#self._evars = dict()
@@ -537,17 +539,18 @@ class PackageInfo ( object ):
"""
pkgfile = self.get ( "package_file" )
- if hasattr ( self, 'hashdict' ) and self.hashdict:
+ if self.hashdict:
new_hashes = (
frozenset ( hashlist ) - frozenset ( self.hashdict.keys() )
)
-
- if new_hashes:
- self.hashdict.update (
- roverlay.digest.multihash_file ( pkgfile, new_hashes )
- )
else:
- self.hashdict = roverlay.digest.multihash_file ( pkgfile, hashlist )
+ new_hashes = hashlist
+
+
+ if new_hashes:
+ self.hashdict.update (
+ roverlay.digest.multihash_file ( pkgfile, new_hashes )
+ )
return self.hashdict
# --- end of make_hashes (...) ---