From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 1 Jun 2007 19:37:58 +0000 (-0000)
Subject: Don't complain when  is missing unless manifest1 compatibility is enabled. (trunk... 
X-Git-Tag: v2.1.2.10~21
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9ea257c39a2a9031adc75622b69a2dc34a63a594;p=portage.git

Don't complain when  is missing unless manifest1 compatibility is enabled. (trunk r6711 and r6716)

svn path=/main/branches/2.1.2/; revision=6717
---

diff --git a/bin/repoman b/bin/repoman
index 51b3ba535..34227bfd9 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -783,17 +783,14 @@ for x in scanlist:
 				s = s[s.rfind("\n") + 1:]
 			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:
+	has_filesdir = True
+	if not os.path.isdir(os.path.join(checkdir, "files")):
+		has_filesdir = False
+		if manifest1_compat:
 			stats["filedir.missing"] += 1
 			fails["filedir.missing"].append(checkdir)
-			continue
+
+	if isCvs:
 		try:
 			myf=open(checkdir+"/CVS/Entries","r")
 			myl=myf.readlines()
@@ -811,6 +808,7 @@ for x in scanlist:
 				fails["CVS/Entries.IO_error"].append(checkdir+"/CVS/Entries")
 			continue
 
+	if isCvs and has_filesdir:
 		try:
 			myf=open(checkdir+"/files/CVS/Entries","r")
 			myl=myf.readlines()