diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-05-22 13:17:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-22 13:17:52 +0000 |
| commit | b12140596b680df2bb0c3622d89c9afd4514d276 (patch) | |
| tree | 10d0c732491b9848154d7008c6e2a5db3803938b | |
| parent | For bug #179206, improve efficiency by using a containment test instead of st... (diff) | |
| download | portage-b12140596b680df2bb0c3622d89c9afd4514d276.tar.gz portage-b12140596b680df2bb0c3622d89c9afd4514d276.tar.bz2 portage-b12140596b680df2bb0c3622d89c9afd4514d276.zip | |
In fetch(), don't try to parse digests unless the "O" variable is defined. (trunk r6560:6561)
svn path=/main/branches/2.1.2/; revision=6575
| -rw-r--r-- | pym/portage.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index 9a9b3bbf7..0abaf3126 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2313,8 +2313,13 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", if try_mirrors: mymirrors += [x.rstrip("/") for x in mysettings["GENTOO_MIRRORS"].split() if x] - mydigests = Manifest( - mysettings["O"], mysettings["DISTDIR"]).getTypeDigests("DIST") + pkgdir = mysettings.get("O") + if pkgdir: + mydigests = Manifest( + pkgdir, mysettings["DISTDIR"]).getTypeDigests("DIST") + else: + # no digests because fetch was not called for a specific package + mydigests = {} fsmirrors = [] for x in range(len(mymirrors)-1,-1,-1): |