summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-03-08 06:56:09 +0000
committerZac Medico <zmedico@gentoo.org>2010-03-08 06:56:09 +0000
commit0f666446f855aae626307dcdf34a3a3b2bda6c98 (patch)
tree8602ef2ec44e913f0919cb624255d6972d879bbe
parenta2701f9b2f887941af8114a50c66c38c868a023b (diff)
downloadportage-0f666446f855aae626307dcdf34a3a3b2bda6c98.tar.gz
portage-0f666446f855aae626307dcdf34a3a3b2bda6c98.tar.bz2
portage-0f666446f855aae626307dcdf34a3a3b2bda6c98.zip
Bug #308415 - Fix broken uri parameter passed to fetch () for some cases when
using ebuild(1). svn path=/main/trunk/; revision=15755
-rw-r--r--pym/portage/package/ebuild/doebuild.py26
1 files changed, 14 insertions, 12 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index a381052a1..4ca74e591 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -810,7 +810,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
mydo not in ("digest", "manifest") and "noauto" not in features)
alist = mysettings.configdict["pkg"].get("A")
aalist = mysettings.configdict["pkg"].get("AA")
- if alist is None or aalist is None:
+ if alist is None or aalist is None or \
+ (not emerge_skip_distfiles and need_distfiles):
# Make sure we get the correct tree in case there are overlays.
mytree = os.path.realpath(
os.path.dirname(os.path.dirname(mysettings["O"])))
@@ -827,25 +828,26 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
return 1
mysettings.configdict["pkg"]["A"] = " ".join(alist)
mysettings.configdict["pkg"]["AA"] = " ".join(aalist)
+
+ if not emerge_skip_distfiles and need_distfiles:
+ if "mirror" in features or fetchall:
+ fetchme = aalist
+ else:
+ fetchme = alist
+ if not fetch(fetchme, mysettings, listonly=listonly,
+ fetchonly=fetchonly):
+ return 1
+
else:
alist = set(alist.split())
aalist = set(aalist.split())
- if ("mirror" in features) or fetchall:
- fetchme = aalist
- checkme = aalist
- else:
- fetchme = alist
- checkme = alist
if mydo == "fetch":
# Files are already checked inside fetch(),
# so do not check them again.
checkme = []
-
- if not emerge_skip_distfiles and \
- need_distfiles and not fetch(
- fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
- return 1
+ else:
+ checkme = alist
if mydo == "fetch" and listonly:
return 0