extras-buildsys/utils package-builder.py, 1.4, 1.5 repoconv.py, 1.1, 1.2

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4647/utils

Modified Files:
	package-builder.py repoconv.py 
Log Message:
2005-06-17  Dan Williams <dcbw at redhat.com>

	* utils/package-builder.py
		- Simply arguments a bit, same command now for CVS or SRPM builds.  Script
			assumes that if the cvs/srpm argument ends with .src.rpm and exists
			locally, that its an SRPM build.

	* utils/repoconv.py
		- Copy debuginfo RPMs too




Index: package-builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/package-builder.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- package-builder.py	17 Jun 2005 03:10:30 -0000	1.4
+++ package-builder.py	17 Jun 2005 15:52:35 -0000	1.5
@@ -207,9 +207,8 @@
     if len(sys.argv) < 2:
         print "Usage:\npackage-builder.py <command>\n\n"
         print "      <command> is one of:"
-        print "      enqueue <package> <cvs_tag> <target>"
-        print "      enqueue_srpm <package> <cvs_tag> <target>"
-        print "      list_own_jobs"
+        print "      build [package_name] [cvs_tag | srpm_path] [target]"
+        print "      list"
         print "      update_clients"
         print "      list_clients"
         sys.exit(1)
@@ -229,17 +228,16 @@
         print e.message
         sys.exit(1)
 
-    if cmd == 'enqueue':
+    if cmd == 'build':
+        item = sys.argv[2:]
         try:
-            enqueue(server, email, sys.argv[2:])
+            if item.endswith(".src.rpm") and os.path.exists(item):
+                enqueue_srpm(server, email, item)
+            else:
+                enqueue(server, email, item)
         except CommandException, e:
             print e.message
-    elif cmd == 'enqueue_srpm':
-        try:
-            enqueue_srpm(server, email, sys.argv[2:])
-        except CommandException, e:
-            print e.message
-    elif cmd == 'list_own_jobs':
+    elif cmd == 'list':
         list_own_jobs(server, email)
     elif cmd == 'update_clients':
         update_clients(server, email)


Index: repoconv.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/repoconv.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- repoconv.py	17 Jun 2005 15:41:45 -0000	1.1
+++ repoconv.py	17 Jun 2005 15:52:35 -0000	1.2
@@ -35,6 +35,7 @@
     filedict = {}
     filedict['srpm'] = []
     filedict['rpm'] = []
+    filedict['debuginfo'] = []
     for root, dirs, files in os.walk(path):
         for file in files:
             # match the files to what list they should be in
@@ -48,7 +49,7 @@
             else:
                 which = 'other'
 
-            if which == 'srpm' or which == 'rpm':
+            if which == 'srpm' or which == 'rpm' or which == 'debuginfo':
                 fullfile = os.path.join(root, file)
                 filedict[which].append(fullfile)
     return filedict
@@ -75,7 +76,7 @@
     if not os.path.exists(destdir):
         os.makedirs(destdir)
 
-    for package in files['srpm'] + files['rpm']:
+    for package in files['srpm'] + files['rpm'] + files['debuginfo']:
         if dest_flat:
             dest_file = os.path.join(destdir, os.path.basename(package))
         else: