extras-buildsys/utils extras-push-new,1.1,1.2

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	extras-push-new 
Log Message:
re-use code


Index: extras-push-new
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extras-push-new	6 May 2006 12:56:40 -0000	1.1
+++ extras-push-new	6 May 2006 13:14:41 -0000	1.2
@@ -121,6 +121,39 @@
         self.file.close()
 
 
+def getrunfilename(dist):
+    runfilename = os.path.join(rundir, dist)
+    if DEBUG:
+        runfilename += '.DEBUG'
+    return runfilename
+
+
+def getlinesfromrunfile(dist):
+    runfilename = getrunfilename(dist)
+    pkglist = []
+    if os.path.isfile(runfilename):
+        try:
+            rundirfile = open(runfilename,'r')
+            for line in rundirfile:
+                pkglist.append( line.rstrip() )
+            rundirfile.close()
+        except IOError:
+            print 'ERROR: Could not open %s' % runfilename
+            sys.exit(5)
+    return pkglist
+
+
+def emptyrunfile(dist):
+    runfilename = getrunfilename(dist)
+    if not os.path.isfile(runfilename):
+        return
+    try:
+        os.remove(runfilename)
+    except:
+        print 'ERROR: Could not remove %s' % runfilename
+        pass
+
+
 # ====================================================================
 # (previously in extras-sign-move.py)
 
@@ -205,9 +238,7 @@
 
     
 def sign_move(dist):
-    runfilename = os.path.join(rundir, dist)
-    if DEBUG:
-        runfilename += '.DEBUG'
+    runfilename = getrunfilename(dist)
     try:
         rundirfile = open(runfilename,'a')
     except:
@@ -378,36 +409,6 @@
 
 # ====================================================================
 
-def getlinesfromrunfile(dist):
-    runfilename = os.path.join(rundir, dist)
-    if DEBUG:
-        runfilename += '.DEBUG'
-    pkglist = []
-    if os.path.isfile(runfilename):
-        try:
-            rundirfile = open(runfilename,'r')
-            for line in rundirfile:
-                pkglist.append( line.rstrip() )
-            rundirfile.close()
-        except IOError:
-            print 'ERROR: Could not open %s' % runfilename
-            sys.exit(5)
-    return pkglist
-
-
-def emptyrunfile(dist):
-    runfilename = os.path.join(rundir, dist)
-    if DEBUG:
-        runfilename += '.DEBUG'
-    if not os.path.isfile(runfilename):
-        return
-    try:
-        os.remove(runfilename)
-    except:
-        print 'ERROR: Could not remove %s' % runfilename
-        pass
-    
-
 if __name__ == '__main__':
     if config['gidcheck']:
         if os.getgid() != signersgid: