Attachment #167252 for bug #239560

Lines 260-265 register_die_hook() { Link Here

(-)a/bin/ebuild.sh (+6 lines)
260	export EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} $*"	260	export EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} $*"
261	}	261	}
262		262
		263	# Ensure that $PWD is sane whenever possible.
		264	if ! hasq "$EBUILD_PHASE" clean depend help ; then
		265	cd "$PORTAGE_BUILDDIR" \|\| \
		266	die "PORTAGE_BUILDDIR does not exist: '$PORTAGE_BUILDDIR'"
		267	fi
		268
263	#if no perms are specified, dirs/files will have decent defaults	269	#if no perms are specified, dirs/files will have decent defaults
264	#(not secretive, but not stupid)	270	#(not secretive, but not stupid)
265	umask 022	271	umask 022




						import portage_manifest as manifest
						mf = manifest.Manifest(
							pkgdir, self.settings["DISTDIR"])
						fetchlist = self.portdb.getfetchlist(mycpv,
							mysettings=self.settings, all=True)[1]
						try:
							fetchlist = self.portdb.getfetchlist(mycpv,
								mysettings=self.settings, all=True)[1]
						except portage_exception.InvalidDependString, e:
							file_size_str = "Unknown (%s)" % (e,)
							del e
						else:
							try:
								mysum[0] = mf.getDistfilesSize(fetchlist)
							except KeyError, e:
								file_size_str = "Unknown (missing " + \
									"digest for %s)" % (e,)
								del e

					available = False
					for db in self._dbs:

		self._aux_get = self.dbapi.aux_get
		self.dbapi.aux_get = self._aux_get_wrapper
		self._aux_get_history = set()
		self._portdb_keys = ["EAPI", "DEPEND", "RDEPEND", "PDEPEND"]
		self._portdb = portdb
		self._global_updates = None


			# Use the live ebuild metadata if possible.
			live_metadata = dict(izip(self._portdb_keys,
				self._portdb.aux_get(pkg, self._portdb_keys)))
			if not portage.eapi_is_supported(live_metadata["EAPI"]):
				raise KeyError(pkg)
			self.dbapi.aux_update(pkg, live_metadata)
		except (KeyError, portage_exception.PortageException):
			if self._global_updates is None:

Lines 31-37 def filter_bash_environment(pattern, file_in, file_out): Link Here

(-)a/bin/filter-bash-environment.py (-1 / +1 lines)
31	file_out.write(line)	31	file_out.write(line)
32	continue	32	continue
33	if pattern.match(line) is None:	33	if pattern.match(line) is None:
34	file_out.write(line)	34	file_out.write(line.replace("\1", ""))
35		35
36	if __name__ == "__main__":	36	if __name__ == "__main__":
37	description = "Filter out any lines that match a given PATTERN " + \	37	description = "Filter out any lines that match a given PATTERN " + \

Lines 4475-4482 def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, Link Here

(-)a/pym/portage.py (-2 / +1 lines)
4475		4475
4476	# Build directory creation isn't required for any of these.	4476	# Build directory creation isn't required for any of these.
4477	have_build_dirs = False	4477	have_build_dirs = False
4478	if mydo not in ("clean", "cleanrm", "digest",	4478	if mydo not in ("clean", "cleanrm", "digest", "help", "manifest"):
4479	"fetch", "help", "manifest"):
4480	mystatus = prepare_build_dirs(myroot, mysettings, cleanup)	4479	mystatus = prepare_build_dirs(myroot, mysettings, cleanup)
4481	if mystatus:	4480	if mystatus:
4482	return mystatus	4481	return mystatus

Return to bug 239560

Lines 634-646 class search: Link Here

(-)a/bin/emerge (-7 / +15 lines)
634	import portage_manifest as manifest	634	import portage_manifest as manifest
635	mf = manifest.Manifest(	635	mf = manifest.Manifest(
636	pkgdir, self.settings["DISTDIR"])	636	pkgdir, self.settings["DISTDIR"])
637	fetchlist = self.portdb.getfetchlist(mycpv,
638	mysettings=self.settings, all=True)[1]
639	try:	637	try:
640	mysum[0] = mf.getDistfilesSize(fetchlist)	638	fetchlist = self.portdb.getfetchlist(mycpv,
641	except KeyError, e:	639	mysettings=self.settings, all=True)[1]
642	file_size_str = "Unknown (missing digest for %s)" % \	640	except portage_exception.InvalidDependString, e:
643	str(e)	641	file_size_str = "Unknown (%s)" % (e,)
		642	del e
		643	else:
		644	try:
		645	mysum[0] = mf.getDistfilesSize(fetchlist)
		646	except KeyError, e:
		647	file_size_str = "Unknown (missing " + \
		648	"digest for %s)" % (e,)
		649	del e
644		650
645	available = False	651	available = False
646	for db in self._dbs:	652	for db in self._dbs:
Lines 1083-1089 class FakeVartree(portage.vartree): Link Here
1083	self._aux_get = self.dbapi.aux_get	1089	self._aux_get = self.dbapi.aux_get
1084	self.dbapi.aux_get = self._aux_get_wrapper	1090	self.dbapi.aux_get = self._aux_get_wrapper
1085	self._aux_get_history = set()	1091	self._aux_get_history = set()
1086	self._portdb_keys = ["DEPEND", "RDEPEND", "PDEPEND"]	1092	self._portdb_keys = ["EAPI", "DEPEND", "RDEPEND", "PDEPEND"]
1087	self._portdb = portdb	1093	self._portdb = portdb
1088	self._global_updates = None	1094	self._global_updates = None
1089		1095
Lines 1095-1100 class FakeVartree(portage.vartree): Link Here
1095	# Use the live ebuild metadata if possible.	1101	# Use the live ebuild metadata if possible.
1096	live_metadata = dict(izip(self._portdb_keys,	1102	live_metadata = dict(izip(self._portdb_keys,
1097	self._portdb.aux_get(pkg, self._portdb_keys)))	1103	self._portdb.aux_get(pkg, self._portdb_keys)))
		1104	if not portage.eapi_is_supported(live_metadata["EAPI"]):
		1105	raise KeyError(pkg)
1098	self.dbapi.aux_update(pkg, live_metadata)	1106	self.dbapi.aux_update(pkg, live_metadata)
1099	except (KeyError, portage_exception.PortageException):	1107	except (KeyError, portage_exception.PortageException):
1100	if self._global_updates is None:	1108	if self._global_updates is None: