From ba761f5a38e7b95b5cd19f559dc538fd285ee808 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 28 Jul 2006 17:46:53 +0000 Subject: [PATCH] Pass in the path to the base of the current tree to ensure that the correct fetchlist is used when there are overlays present. svn path=/main/trunk/; revision=4045 --- bin/ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/ebuild b/bin/ebuild index 22a65482a..398e08283 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -85,6 +85,7 @@ def discard_digests(myebuild, mysettings, mydbapi): otherwise have to manually remove the Manifest and files/digest-* files in order to ensure correct results.""" pkgdir = os.path.dirname(myebuild) + mytree = os.path.realpath(os.path.dirname(os.path.dirname(pkgdir))) cat, pkg = pkgdir.split(os.sep)[-2:] cpv = cat + "/" + os.path.basename(myebuild)[:-7] from portage_manifest import Manifest @@ -92,7 +93,8 @@ def discard_digests(myebuild, mysettings, mydbapi): fetchlist_dict=portage.FetchlistDict(pkgdir, mysettings, mydbapi)) mf.create(requiredDistfiles=None, assumeDistHashesSometimes=True, assumeDistHashesAlways=True) - distfiles = mydbapi.getfetchlist(cpv, mysettings=mysettings, all=True)[1] + distfiles = mydbapi.getfetchlist(cpv, + mysettings=mysettings, all=True, mytree=mytree)[1] for myfile in distfiles: try: del mf.fhashdict["DIST"][myfile] -- 2.26.2