[patch] repoman-filesdir-check.patch

repoman-filedir-issues.patch (text/plain), 2.12 KB, created by Brian Harring (RETIRED) on 2004-07-15 01:45:50 UTC

--- portage-2.0.51_pre13/bin/repoman	2004-07-08 11:02:20.000000000 -0500
+++ portage/bin/repoman	2004-07-15 03:37:23.129854448 -0500
@@ -69,6 +70,8 @@
 "DEPEND.syntax","RDEPEND.syntax","PDEPEND.syntax",
 "ebuild.syntax","ebuild.output","variable.readonly",
 "ebuild.nesteddie","LICENSE.invalid",
+"filedir.missing",
+"CVS/Entries.IO_error",
 "IUSE.invalid","KEYWORDS.invalid",
 "ebuild.nostable","ebuild.allmasked",
 "ebuild.majorsyn", "ebuild.minorsyn",
@@ -112,6 +115,8 @@
 	"digest.notadded":"Digests that exist but have not been added to cvs",
 	"digest.unmatch":"Digests which are incomplete (please check if your USE/ARCH includes all files)",
 	"ebuild.notadded":"Ebuilds that exist but have not been added to cvs",
+	"filedir.missing":"Packages *must* have a file directory",
+	"CVS/Entries.IO_error":"Flagged when commiting, and CVS/Entries IO fails",
 	"changelog.notadded":"ChangeLogs that exist but have not been added to cvs",
 	"KEYWORDS.missing":"Ebuilds that have a missing KEYWORDS variable",
 	"LICENSE.missing":"Ebuilds that have a missing LICENSE variable",
@@ -536,6 +541,10 @@
 			ebuildlist.append(y[:-7])
 	digestlist=[]
 	if isCvs:
+		if len(ebuildlist) and not os.path.exists(checkdir+"/files"):
+			stats["filedir.missing"]=stats["filedir.missing"]+1
+			fails["filedir.missing"].append(checkdir)
+			continue
 		try:
 			myf=open(checkdir+"/CVS/Entries","r")
 			myl=myf.readlines()
@@ -550,8 +559,13 @@
 					eadded.append(splitl[0][:-7])
 				if splitl[0]=="ChangeLog":
 					cladded=1
+
 		except IOError:
-			continue
+			if mymode == "commit":
+				stats["CVS/Entries.IO_error"]=stats["CVS/Entries.IO_error"]+1
+				fails["CVS/Entries.IO_error"].append(checkdir+"/CVS/Entries")
+				
+#			continue
 
 		try:
 			myf=open(checkdir+"/files/CVS/Entries","r")
@@ -566,7 +580,10 @@
 				if splitl[0][:7]=="digest-":
 					dadded.append(splitl[0][7:])
 		except IOError:
-			continue
+			if mymode == "commit":
+				stats["CVS/Entries.IO_error"]=stats["CVS/Entries.IO_error"]+1
+				fails["CVS/Entries.IO_error"].append(checkdir+"/CVS/Entries")
+#			continue
 
 	if os.path.exists(checkdir+"/files"):
 		filesdirlist=os.listdir(checkdir+"/files")