Don't complain when $FILESDIR is missing unless manifest1 compatibility is enabled.
authorZac Medico <zmedico@gentoo.org>
Fri, 1 Jun 2007 18:30:22 +0000 (18:30 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 1 Jun 2007 18:30:22 +0000 (18:30 -0000)
svn path=/main/trunk/; revision=6711

bin/repoman

index f47911665da7d7a564d950113392da24d9899958..f56769451cca328ac2f87b91755d65faa2c9a643 100755 (executable)
@@ -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")