From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2FE611381F3 for ; Wed, 10 Jul 2013 16:17:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81337E09ED; Wed, 10 Jul 2013 16:17:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 124ACE09ED for ; Wed, 10 Jul 2013 16:17:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E565833E912 for ; Wed, 10 Jul 2013 16:16:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1627AE5469 for ; Wed, 10 Jul 2013 16:16:57 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1373472505.c598a34408dbfcc45938458ddd3317644a79f8d4.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/pkgdir/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/overlay/pkgdir/packagedir_base.py roverlay/overlay/pkgdir/packagedir_ebuildmanifest.py roverlay/overlay/pkgdir/packagedir_newmanifest.py X-VCS-Directories: roverlay/overlay/pkgdir/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: c598a34408dbfcc45938458ddd3317644a79f8d4 X-VCS-Branch: master Date: Wed, 10 Jul 2013 16:16:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d4f1ac37-de90-4be0-ae12-2b6024b4b5ec X-Archives-Hash: 94332224aab633a7a1f9bb2d530e15b2 Message-ID: <20130710161657.ZZFmAl5lWIASohTn7iDH5BwQJsEtM8ySAL78sdXG4cA@z> commit: c598a34408dbfcc45938458ddd3317644a79f8d4 Author: André Erdmann mailerd de> AuthorDate: Wed Jul 10 16:08:25 2013 +0000 Commit: André Erdmann mailerd 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;