Fix it so repoman still does QA when $FILESDIR doesn't exist.

svn path=/main/trunk/; revision=6716

diff --git a/bin/repoman b/bin/repoman
index f56769451cca328ac2f87b91755d65faa2c9a643..9b7a21d6ca1a8067325fa364123ca07583182722 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -795,12 +795,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))
 
+       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)
+
        if isCvs:
-               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")
                        myl=myf.readlines()
@@ -818,6 +820,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()