[gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/overlay/pkgdir/

["André Erdmann" <dywi@mailerd.de>]

commit:     c598a34408dbfcc45938458ddd3317644a79f8d4
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 10 16:08:25 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 10 16:08:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c598a344

roverlay/overlay/pkgdir: create all hashes at once

---
 roverlay/overlay/pkgdir/packagedir_base.py           | 4 ----
 roverlay/overlay/pkgdir/packagedir_ebuildmanifest.py | 1 +
 roverlay/overlay/pkgdir/packagedir_newmanifest.py    | 2 ++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/roverlay/overlay/pkgdir/packagedir_base.py b/roverlay/overlay/pkgdir/packagedir_base.py
index 53ebc42..ad00a05 100644
--- a/roverlay/overlay/pkgdir/packagedir_base.py
+++ b/roverlay/overlay/pkgdir/packagedir_base.py
@@ -819,10 +819,6 @@ class PackageDirBase ( object ):
             or patch_ebuild ( efile, pvr, patchview.get_patches ( pvr ) )
          ):
 
-            # generate hashes here (benefit from threading)
-            # FIXME/TODO: ^ actually faster?
-            p_info.make_distmap_hash()
-
             self._need_manifest = True
 
             # update metadata for each successfully written ebuild

diff --git a/roverlay/overlay/pkgdir/packagedir_ebuildmanifest.py b/roverlay/overlay/pkgdir/packagedir_ebuildmanifest.py
index 9766606..71cfd23 100644
--- a/roverlay/overlay/pkgdir/packagedir_ebuildmanifest.py
+++ b/roverlay/overlay/pkgdir/packagedir_ebuildmanifest.py
@@ -102,6 +102,7 @@ class PackageDir ( roverlay.overlay.pkgdir.packagedir_base.PackageDirBase ):
          # TODO: optimize this further?
          # -> "not has physical_only?"
          #     (should be covered by "has package_file")
+         p_info.make_distmap_hash()
          distdir.add ( p ['package_file'], p ['package_src_destpath'], p )
       # -- end for;
 

diff --git a/roverlay/overlay/pkgdir/packagedir_newmanifest.py b/roverlay/overlay/pkgdir/packagedir_newmanifest.py
index 04d202d..ae6c059 100644
--- a/roverlay/overlay/pkgdir/packagedir_newmanifest.py
+++ b/roverlay/overlay/pkgdir/packagedir_newmanifest.py
@@ -89,6 +89,8 @@ class PackageDir ( roverlay.overlay.pkgdir.packagedir_base.PackageDirBase ):
       #
       distdir = self.DISTROOT.get_distdir ( self.name )
       for p in pkgs_for_manifest:
+         # order is important here
+         # add_package_entry() calls multihash with all required digests
          manifest.add_package_entry ( p )
          distdir.add ( p ['package_file'], p ['package_src_destpath'], p )
       # -- end for;