| 1 |
commit: 9b576fa2d1fc1b4b5c202793e8d5c2eafe079304 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Thu Aug 1 12:30:46 2013 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Thu Aug 1 12:30:46 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=9b576fa2 |
| 7 |
|
| 8 |
roverlay/packageinfo: bind hashdict in __init__() |
| 9 |
|
| 10 |
--- |
| 11 |
roverlay/packageinfo.py | 17 ++++++++++------- |
| 12 |
1 file changed, 10 insertions(+), 7 deletions(-) |
| 13 |
|
| 14 |
diff --git a/roverlay/packageinfo.py b/roverlay/packageinfo.py |
| 15 |
index 25e67d9..752f996 100644 |
| 16 |
--- a/roverlay/packageinfo.py |
| 17 |
+++ b/roverlay/packageinfo.py |
| 18 |
@@ -134,6 +134,8 @@ class PackageInfo ( object ): |
| 19 |
# self.selfdeps is a list of _mandatory_ selfdeps |
| 20 |
self.selfdeps = None |
| 21 |
|
| 22 |
+ self.hashdict = dict() |
| 23 |
+ |
| 24 |
#self.selfdeps_valid = UNDEF |
| 25 |
#self.overlay_package_ref = None |
| 26 |
#self._evars = dict() |
| 27 |
@@ -537,17 +539,18 @@ class PackageInfo ( object ): |
| 28 |
""" |
| 29 |
pkgfile = self.get ( "package_file" ) |
| 30 |
|
| 31 |
- if hasattr ( self, 'hashdict' ) and self.hashdict: |
| 32 |
+ if self.hashdict: |
| 33 |
new_hashes = ( |
| 34 |
frozenset ( hashlist ) - frozenset ( self.hashdict.keys() ) |
| 35 |
) |
| 36 |
- |
| 37 |
- if new_hashes: |
| 38 |
- self.hashdict.update ( |
| 39 |
- roverlay.digest.multihash_file ( pkgfile, new_hashes ) |
| 40 |
- ) |
| 41 |
else: |
| 42 |
- self.hashdict = roverlay.digest.multihash_file ( pkgfile, hashlist ) |
| 43 |
+ new_hashes = hashlist |
| 44 |
+ |
| 45 |
+ |
| 46 |
+ if new_hashes: |
| 47 |
+ self.hashdict.update ( |
| 48 |
+ roverlay.digest.multihash_file ( pkgfile, new_hashes ) |
| 49 |
+ ) |
| 50 |
|
| 51 |
return self.hashdict |
| 52 |
# --- end of make_hashes (...) --- |
Archives