Added new dependency check to repoman. This closes #36887.

3 files changed, 18 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index b5b41e6..aae7567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Portage; the Gentoo Linux ports system 
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.512 2004/01/03 18:08:46 nakano Exp $
+# $Id: ChangeLog,v 1.513 2004/01/04 10:41:35 nakano Exp $
+
+  04 Jan 2004; Masatomo Nakano <nakano@gentoo.org> repoman, portage.py:
+  Added new dependency check to repoman. This closes #36887.
 
   03 Jan 2004; Masatomo Nakano <nakano@gentoo.org> emerge: Modified 
   to specific port number in emerge sync. This closes #36994
diff --git a/bin/repoman b/bin/repoman
index aa1e42d..e6cdc5f 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/repoman,v 1.43 2003/12/21 08:03:26 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/repoman,v 1.44 2004/01/04 10:41:35 nakano Exp $
 
 # Next to do: dep syntax checking in mask files
 # Then, check to make sure deps are satisfiable (to avoid "can't find match for" problems)
@@ -717,7 +717,13 @@ for x in scanlist:
 				mykey=mytype+".bad"+suffix
 				myvalue=string.join(portage.db["/"]["porttree"].dbapi.aux_get(catdir+"/"+y,[ mytype ]))
 
-				mydep=portage.dep_check(myvalue,portage.db["/"]["porttree"].dbapi,repoman_settings,use="all",mode=matchmode)
+				try:
+					mydep=portage.dep_check(myvalue,portage.db["/"]["porttree"].dbapi,repoman_settings,use="all",mode=matchmode)
+				except KeyError, e:
+					stats[mykey]=stats[mykey]+1
+					fails[mykey].append(x+"/"+y+".ebuild: "+keyword+" "+repr(e[0]))
+					continue
+
 				if mydep[0]==1:
 					if mydep[1]!=[]:
 						#we have some unsolvable deps
diff --git a/pym/portage.py b/pym/portage.py
index ea92b89..b79325e 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1,7 +1,7 @@
 # portage.py -- core Portage functionality
 # Copyright 1998-2003 Daniel Robbins, Gentoo Technologies, Inc.
 # Distributed under the GNU Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.368 2004/01/02 10:37:01 nakano Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.369 2004/01/04 10:41:35 nakano Exp $
 
 VERSION="2.0.50_pre8"
 
@@ -2947,7 +2947,11 @@ def key_expand(mykey,mydb=None):
 def cpv_expand(mycpv,mydb=None):
 	myslash=mycpv.split("/")
 	mysplit=pkgsplit(myslash[-1])
-	if len(myslash)==2:
+	if len(myslash)>2:
+		# this is illegal case.
+		mysplit=[]
+		mykey=mycpv
+	elif len(myslash)==2:
 		if mysplit:
 			mykey=myslash[0]+"/"+mysplit[0]
 		else: