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

(-)bin/emerge (-16 / +24 lines)
Lines 1517-1539 Link Here
1517
		#processing dependencies
1517
		#processing dependencies
1518
		""" Call portage.dep_check to evaluate the use? conditionals and make sure all
1518
		""" Call portage.dep_check to evaluate the use? conditionals and make sure all
1519
		dependencies are satisfiable. """
1519
		dependencies are satisfiable. """
1520
		try:
1520
		if arg:
1521
			if myparent and p_status == "nomerge":
1521
			mymerge = [depstring]
1522
				portage_dep._dep_check_strict = False
1522
			pprovided = pkgsettings.pprovideddict.get(
1523
			mycheck = portage.dep_check(depstring, None,
1523
				portage.dep_getkey(depstring))
1524
				pkgsettings, myuse=myuse,
1524
			if pprovided and portage.match_from_list(depstring, pprovided):
1525
				use_binaries=("--usepkgonly" in self.myopts),
1525
				mymerge = []
1526
				myroot=myroot, trees=self.trees)
1526
		else:
1527
		finally:
1527
			try:
1528
			portage_dep._dep_check_strict = True
1528
				if myparent and p_status == "nomerge":
1529
					portage_dep._dep_check_strict = False
1530
				mycheck = portage.dep_check(depstring, None,
1531
					pkgsettings, myuse=myuse,
1532
					use_binaries=("--usepkgonly" in self.myopts),
1533
					myroot=myroot, trees=self.trees)
1534
			finally:
1535
				portage_dep._dep_check_strict = True
1529
1536
1530
		if not mycheck[0]:
1537
			if not mycheck[0]:
1531
			if myparent:
1538
				if myparent:
1532
				show_invalid_depstring_notice(myparent, depstring, mycheck[1])
1539
					show_invalid_depstring_notice(
1533
			else:
1540
						myparent, depstring, mycheck[1])
1534
				sys.stderr.write("\n%s\n%s\n" % (depstring, mycheck[1]))
1541
				else:
1535
			return 0
1542
					sys.stderr.write("\n%s\n%s\n" % (depstring, mycheck[1]))
1536
		mymerge = mycheck[1]
1543
				return 0
1544
			mymerge = mycheck[1]
1537
1545
1538
		if not mymerge and arg and \
1546
		if not mymerge and arg and \
1539
			portage.best_match_to_list(depstring, self.args_keys):
1547
			portage.best_match_to_list(depstring, self.args_keys):

Return to bug 166939