diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-12-28 12:41:26 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-12-28 12:41:26 -0800 |
commit | e0c7d34a777bbc4f95c55d9036e88aee9fc0a6ae (patch) | |
tree | 4f8f905692e76f31b15cb638d88c9ee0cedf43d2 /pym/portage/package/ebuild/fetch.py | |
parent | dbef4305dedd0b428e788f020bc3c3f94ffee232 (diff) | |
download | portage-e0c7d34a777bbc4f95c55d9036e88aee9fc0a6ae.tar.gz portage-e0c7d34a777bbc4f95c55d9036e88aee9fc0a6ae.tar.bz2 portage-e0c7d34a777bbc4f95c55d9036e88aee9fc0a6ae.zip |
EbuildFetcher: pass digests to fetch()
Diffstat (limited to 'pym/portage/package/ebuild/fetch.py')
-rw-r--r-- | pym/portage/package/ebuild/fetch.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py index f1bd2408a..7e4365fb7 100644 --- a/pym/portage/package/ebuild/fetch.py +++ b/pym/portage/package/ebuild/fetch.py @@ -230,7 +230,8 @@ _size_suffix_map = { 'Y' : 80, } -def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",use_locks=1, try_mirrors=1): +def fetch(myuris, mysettings, listonly=0, fetchonly=0, + locks_in_subdir=".locks", use_locks=1, try_mirrors=1, digests=None): "fetch files. Will use digest file if available." if not myuris: @@ -352,12 +353,14 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", skip_manifest = mysettings.get("EBUILD_SKIP_MANIFEST") == "1" pkgdir = mysettings.get("O") - if not (pkgdir is None or skip_manifest): + if digests is None and not (pkgdir is None or skip_manifest): mydigests = Manifest( pkgdir, mysettings["DISTDIR"]).getTypeDigests("DIST") - else: + elif digests is None: # no digests because fetch was not called for a specific package mydigests = {} + else: + mydigests = digests ro_distdirs = [x for x in \ shlex_split(mysettings.get("PORTAGE_RO_DISTDIRS", "")) \ |