Attachment #385150 for bug #523152

View | Details | Raw Unified | Return to bug 523152
Collapse All | Expand All

Lines 25-30 portage.proxy.lazyimport.lazyimport(globals(), Link Here

(-)a/pym/portage/dbapi/vartree.py (+9 lines)
25	'_merge_unicode_error', '_spawn_phase',	25	'_merge_unicode_error', '_spawn_phase',
26	'portage.package.ebuild.prepare_build_dirs:prepare_build_dirs',	26	'portage.package.ebuild.prepare_build_dirs:prepare_build_dirs',
27	'portage.package.ebuild._ipc.QueryCommand:QueryCommand',	27	'portage.package.ebuild._ipc.QueryCommand:QueryCommand',
		28	'portage.process:find_binary',
28	'portage.util:apply_secpass_permissions,ConfigProtect,ensure_dirs,' + \	29	'portage.util:apply_secpass_permissions,ConfigProtect,ensure_dirs,' + \
29	'writemsg,writemsg_level,write_atomic,atomic_ofstream,writedict,' + \	30	'writemsg,writemsg_level,write_atomic,atomic_ofstream,writedict,' + \
30	'grabdict,normalize_path,new_protect_filename',	31	'grabdict,normalize_path,new_protect_filename',
Lines 5011-5016 class dblink(object): Link Here
5011	quickpkg_binary = os.path.join(self.settings["PORTAGE_BIN_PATH"],	5012	quickpkg_binary = os.path.join(self.settings["PORTAGE_BIN_PATH"],
5012	"quickpkg")	5013	"quickpkg")
5013		5014
		5015	if not os.access(quickpkg_binary, os.EX_OK):
		5016	# If not running from the source tree, use PATH.
		5017	quickpkg_binary = find_binary("quickpkg")
		5018	if quickpkg_binary is None:
		5019	self._display_merge("quickpkg: command not found",
		5020	level=logging.ERROR, noiselevel=-1)
		5021	return 127
		5022
5014	# Let quickpkg inherit the global vartree config's env.	5023	# Let quickpkg inherit the global vartree config's env.
5015	env = dict(self.vartree.settings.items())	5024	env = dict(self.vartree.settings.items())
5016	env["__PORTAGE_INHERIT_VARDB_LOCK"] = "1"	5025	env["__PORTAGE_INHERIT_VARDB_LOCK"] = "1"

Lines 243-248 pkg_preinst() { Link Here

(-)a/pym/portage/tests/emerge/test_simple.py (-1 / +10 lines)
243	emerge_cmd + ("--metadata",),	243	emerge_cmd + ("--metadata",),
244	rm_cmd + ("-rf", cachedir),	244	rm_cmd + ("-rf", cachedir),
245	emerge_cmd + ("--oneshot", "virtual/foo"),	245	emerge_cmd + ("--oneshot", "virtual/foo"),
		246	lambda: self.assertFalse(os.path.exists(
		247	os.path.join(pkgdir, "virtual", "foo-0.tbz2"))),
		248	({"FEATURES" : "unmerge-backup"},) + \
		249	emerge_cmd + ("--unmerge", "virtual/foo"),
		250	lambda: self.assertTrue(os.path.exists(
		251	os.path.join(pkgdir, "virtual", "foo-0.tbz2"))),
246	emerge_cmd + ("--pretend", "dev-libs/A"),	252	emerge_cmd + ("--pretend", "dev-libs/A"),
247	ebuild_cmd + (test_ebuild, "manifest", "clean", "package", "merge"),	253	ebuild_cmd + (test_ebuild, "manifest", "clean", "package", "merge"),
248	emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"),	254	emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"),
Lines 395-400 move dev-util/git dev-vcs/git Link Here
395		401
396	for args in test_commands:	402	for args in test_commands:
397		403
		404	if hasattr(args, '__call__'):
		405	args()
		406	continue
		407
398	if isinstance(args[0], dict):	408	if isinstance(args[0], dict):
399	local_env = env.copy()	409	local_env = env.copy()
400	local_env.update(args[0])	410	local_env.update(args[0])
401	-

Return to bug 523152