Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10394 - main/trunk/pym/portage
Date: Sat, 24 May 2008 22:03:29
Message-Id: E1K01po-000155-OS@stork.gentoo.org
Author: zmedico
Date: 2008-05-24 22:03:27 +0000 (Sat, 24 May 2008)
New Revision: 10394

Modified:
   main/trunk/pym/portage/__init__.py
Log:
For dep_expand() backward compatibility, handle atoms with missing '='
prefix which did not raise an error here before the portage.dep.Atom
class was introduced.


Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2008-05-24 21:33:12 UTC (rev 10393)
+++ main/trunk/pym/portage/__init__.py	2008-05-24 22:03:27 UTC (rev 10394)
@@ -5720,8 +5720,15 @@
 	myindex = orig_dep.index(mydep)
 	prefix = orig_dep[:myindex]
 	postfix = orig_dep[myindex+len(mydep):]
-	return portage.dep.Atom(prefix + cpv_expand(
-		mydep, mydb=mydb, use_cache=use_cache, settings=settings) + postfix)
+	expanded = cpv_expand(mydep, mydb=mydb,
+		use_cache=use_cache, settings=settings)
+	try:
+		return portage.dep.Atom(prefix + expanded + postfix)
+	except portage.exception.InvalidAtom:
+		# Missing '=' prefix is allowed for backward compatibility.
+		if not isvalidatom("=" + prefix + expanded + postfix):
+			raise
+		return portage.dep.Atom("=" + prefix + expanded + postfix)
 
 def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None,
 	use_cache=1, use_binaries=0, myroot="/", trees=None):

-- 
gentoo-commits@l.g.o mailing list