commit: 9d888380b877c7e310fc7799962776d17a242821
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 00:12:08 2015 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 00:12:08 2015 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=9d888380
fix for thin manifest
pym/tbc/qachecks.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/pym/tbc/qachecks.py b/pym/tbc/qachecks.py
index acb080e..892642f 100644
--- a/pym/tbc/qachecks.py
+++ b/pym/tbc/qachecks.py
@@ -22,10 +22,6 @@ import portage
def check_file_in_manifest(pkgdir, mysettings, portdb, cpv,
build_use_flags_list, repo):
myfetchlistdict = portage.FetchlistDict(pkgdir, mysettings, portdb)
my_manifest = portage.Manifest(pkgdir, mysettings['DISTDIR'],
fetchlist_dict=myfetchlistdict, manifest1_compat=False, from_scratch=False)
- ebuild_version = portage.versions.cpv_getversion(cpv)
- package = portage.versions.cpv_getkey(cpv).split("/")[1]
- if my_manifest.findFile(package + "-" + ebuild_version + ".ebuild") is
None:
- return "Ebuild file not found.\n"
tree = portdb.getRepositoryPath(repo)
cpv_fetchmap = portdb.getFetchMap(cpv, useflags=build_use_flags_list,
mytree=tree)
mysettings.unlock()
@@ -37,12 +33,12 @@ def check_file_in_manifest(pkgdir, mysettings, portdb, cpv,
build_use_flags_list
finally:
mysettings.lock()
try:
- my_manifest.checkCpvHashes(cpv, checkDistfiles=True,
onlyDistfiles=False, checkMiscfiles=True)
+ my_manifest.checkCpvHashes(cpv, checkDistfiles=True,
onlyDistfiles=True, checkMiscfiles=False)
except:
return "Can't fetch the file or the hash failed.\n"
try:
portdb.fetch_check(cpv, useflags=build_use_flags_list,
mysettings=mysettings, all=False)
- except:
+ except:
return "Fetch check failed.\n"
return
