Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 308415
Collapse All | Expand All

(-)pym/portage/package/ebuild/doebuild.py (-12 / +14 lines)
Lines 810-816 Link Here
810
			mydo not in ("digest", "manifest") and "noauto" not in features)
810
			mydo not in ("digest", "manifest") and "noauto" not in features)
811
		alist = mysettings.configdict["pkg"].get("A")
811
		alist = mysettings.configdict["pkg"].get("A")
812
		aalist = mysettings.configdict["pkg"].get("AA")
812
		aalist = mysettings.configdict["pkg"].get("AA")
813
		if alist is None or aalist is None:
813
		if alist is None or aalist is None or \
814
			(not emerge_skip_distfiles and need_distfiles):
814
			# Make sure we get the correct tree in case there are overlays.
815
			# Make sure we get the correct tree in case there are overlays.
815
			mytree = os.path.realpath(
816
			mytree = os.path.realpath(
816
				os.path.dirname(os.path.dirname(mysettings["O"])))
817
				os.path.dirname(os.path.dirname(mysettings["O"])))
Lines 827-852 Link Here
827
				return 1
828
				return 1
828
			mysettings.configdict["pkg"]["A"] = " ".join(alist)
829
			mysettings.configdict["pkg"]["A"] = " ".join(alist)
829
			mysettings.configdict["pkg"]["AA"] = " ".join(aalist)
830
			mysettings.configdict["pkg"]["AA"] = " ".join(aalist)
831
832
			if not emerge_skip_distfiles and need_distfiles:
833
				if "mirror" in features or fetchall:
834
					fetchme = aalist
835
				else:
836
					fetchme = alist
837
				if not fetch(fetchme, mysettings, listonly=listonly,
838
					fetchonly=fetchonly):
839
					return 1
840
830
		else:
841
		else:
831
			alist = set(alist.split())
842
			alist = set(alist.split())
832
			aalist = set(aalist.split())
843
			aalist = set(aalist.split())
833
		if ("mirror" in features) or fetchall:
834
			fetchme = aalist
835
			checkme = aalist
836
		else:
837
			fetchme = alist
838
			checkme = alist
839
844
840
		if mydo == "fetch":
845
		if mydo == "fetch":
841
			# Files are already checked inside fetch(),
846
			# Files are already checked inside fetch(),
842
			# so do not check them again.
847
			# so do not check them again.
843
			checkme = []
848
			checkme = []
849
		else:
850
			checkme = alist
844
851
845
		if not emerge_skip_distfiles and \
846
			need_distfiles and not fetch(
847
			fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
848
			return 1
849
850
		if mydo == "fetch" and listonly:
852
		if mydo == "fetch" and listonly:
851
			return 0
853
			return 0
852
854

Return to bug 308415