Attachment #172763 for bug #248059

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




	writemsg("mysplit:  %s\n" % (mysplit), 1)
	writemsg("mysplit2: %s\n" % (mysplit2), 1)

	try:
		myzaps = dep_zapdeps(mysplit, mysplit2, myroot,
			use_binaries=use_binaries, trees=trees)
	except portage.exception.InvalidAtom, e:
		if portage.dep._dep_check_strict:
			raise # This shouldn't happen.
		# dbapi.match() failed due to an invalid atom in
		# the dependencies of an installed package.
		return [0, "Invalid atom: '%s'" % (e,)]

	mylist = flatten(myzaps)
	writemsg("myzaps:   %s\n" % (myzaps), 1)
	writemsg("mylist:   %s\n" % (mylist), 1)




				finally:
					portage.dep._dep_check_strict = True
				if not success:
					# Ignore invalid deps of packages that will
					# be uninstalled anyway.
					continue

 
				priority = priority_map[dep_type]
				for atom in atoms:
					if not isinstance(atom, portage.dep.Atom):
						# Ignore invalid atoms returned from dep_check().
						continue
					if atom.blocker:
						continue
					matches = vardb.match_pkgs(atom)
					if not matches:
						continue

Return to bug 248059

Lines 6614-6621 Link Here

(-)pym/portage/__init__.py (-2 / +10 lines)
6614	writemsg("mysplit: %s\n" % (mysplit), 1)	6614	writemsg("mysplit: %s\n" % (mysplit), 1)
6615	writemsg("mysplit2: %s\n" % (mysplit2), 1)	6615	writemsg("mysplit2: %s\n" % (mysplit2), 1)
6616		6616
6617	myzaps = dep_zapdeps(mysplit, mysplit2, myroot,	6617	try:
6618	use_binaries=use_binaries, trees=trees)	6618	myzaps = dep_zapdeps(mysplit, mysplit2, myroot,
		6619	use_binaries=use_binaries, trees=trees)
		6620	except portage.exception.InvalidAtom, e:
		6621	if portage.dep._dep_check_strict:
		6622	raise # This shouldn't happen.
		6623	# dbapi.match() failed due to an invalid atom in
		6624	# the dependencies of an installed package.
		6625	return [0, "Invalid atom: '%s'" % (e,)]
		6626
6619	mylist = flatten(myzaps)	6627	mylist = flatten(myzaps)
6620	writemsg("myzaps: %s\n" % (myzaps), 1)	6628	writemsg("myzaps: %s\n" % (myzaps), 1)
6621	writemsg("mylist: %s\n" % (mylist), 1)	6629	writemsg("mylist: %s\n" % (mylist), 1)

Lines 12776-12790 Link Here

(-)pym/_emerge/__init__.py (-6 / +8 lines)
12776	finally:	12776	finally:
12777	portage.dep._dep_check_strict = True	12777	portage.dep._dep_check_strict = True
12778	if not success:	12778	if not success:
12779	show_invalid_depstring_notice(	12779	# Ignore invalid deps of packages that will
12780	("installed", myroot, node, "nomerge"),	12780	# be uninstalled anyway.
12781	depstr, atoms)	12781	continue
12782	return	12782
12783
12784	priority = priority_map[dep_type]	12783	priority = priority_map[dep_type]
12785	for atom in atoms:	12784	for atom in atoms:
12786	if atom.startswith("!"):	12785	if not isinstance(atom, portage.dep.Atom):
		12786	# Ignore invalid atoms returned from dep_check().
12787	continue	12787	continue
		12788	if atom.blocker:
		12789	continue
12788	matches = vardb.match_pkgs(atom)	12790	matches = vardb.match_pkgs(atom)
12789	if not matches:	12791	if not matches:
12790	continue	12792	continue