extras-buildsys-temp/automation buildqueue.py, 1.4, 1.5 extras-push.py, 1.3, 1.4

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/fedora/extras-buildsys-temp/automation
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11422

Modified Files:
	buildqueue.py extras-push.py 
Log Message:

make monitor checker deal with conflicts and other garbage
handle odd 'other' case of files in source path.



Index: buildqueue.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/automation/buildqueue.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buildqueue.py	9 May 2005 09:01:28 -0000	1.4
+++ buildqueue.py	10 May 2005 04:46:06 -0000	1.5
@@ -129,7 +129,9 @@
             buildstuff = line.strip().split('\t')
             if len(buildstuff) == 5: # we have a status
                 continue
-
+            if len(buildstuff) < 4: # broken, skip it
+                continue
+                
             buildstuff = tuple(buildstuff)
             if not self.needbuilt.has_key(buildstuff):
                 self.needbuilt[buildstuff] = 1


Index: extras-push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/automation/extras-push.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- extras-push.py	9 May 2005 20:40:41 -0000	1.3
+++ extras-push.py	10 May 2005 04:46:06 -0000	1.4
@@ -57,6 +57,7 @@
     filedict['spec'] = []
     filedict['md5sum'] = []
     filedict['debuginfo'] = []
+    filedict['other'] = []
     for root, dirs, files in os.walk(path):
         for file in files:
             # match the files to what list they should be in
@@ -73,6 +74,9 @@
                 which = 'spec'
             elif file.endswith('.md5sum'):
                 which = 'md5sum'
+            else:
+                which = 'other'
+
             fullfile = os.path.join(root, file)
             filedict[which].append(fullfile)
     return filedict
@@ -259,7 +263,7 @@
     
 if __name__ == '__main__':
     me = os.getcwd()
-    if len(sys.argv) < 1:
+    if len(sys.argv) < 2:
         print "Usage:\nextras-push.py release\n\n"
         sys.exit(1)
     main(sys.argv[1])