Don't complain when is missing unless manifest1 compatibility is enabled. (trunk...

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

diff --git a/bin/repoman b/bin/repoman
index 51b3ba53572d13953b7b4abd4f82c1e2d375e1b7..34227bfd9969eebe6154636a7365d4fe984ff233 100755 (executable)
--- 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()