From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 1 Jun 2007 18:30:22 +0000 (-0000)
Subject: Don't complain when $FILESDIR is missing unless manifest1 compatibility is enabled.
X-Git-Tag: v2.2_pre1~1311
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a630073e781c8bf472cdc4d4f81147fc95ba398b;p=portage.git

Don't complain when $FILESDIR is missing unless manifest1 compatibility is enabled.

svn path=/main/trunk/; revision=6711
---

diff --git a/bin/repoman b/bin/repoman
index f47911665..f56769451 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -796,15 +796,10 @@ for x in scanlist:
 			fails["file.UTF8"].append("%s/%s: line %i, just after: '%s'" % (checkdir, y, line, s))
 
 	if isCvs:
-		try:
-			mystat=os.stat(checkdir+"/files")[0]
-			if len(ebuildlist) and not S_ISDIR(mystat):
-				raise Exception
-		except SystemExit, e:
-			raise  # Need to propogate this
-		except:
-			stats["filedir.missing"] += 1
-			fails["filedir.missing"].append(checkdir)
+		if not os.path.isdir(os.path.join(checkdir, "files")):
+			if manifest1_compat:
+				stats["filedir.missing"] += 1
+				fails["filedir.missing"].append(checkdir)
 			continue
 		try:
 			myf=open(checkdir+"/CVS/Entries","r")