extras-buildsys/utils extras-push-new,1.24.2.2,1.24.2.3

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
      Tag: push-new-tmpdir_20060609
	extras-push-new 
Log Message:
improve errno usage, avoid local variable confusion


Index: extras-push-new
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -r1.24.2.2 -r1.24.2.3
--- extras-push-new	9 Jun 2006 08:15:39 -0000	1.24.2.2
+++ extras-push-new	9 Jun 2006 08:46:54 -0000	1.24.2.3
@@ -121,9 +121,9 @@
             return
         try:
             self.file = open(self.name,'w')
-        except IOError, (errno, strerr):
-            print "ERROR: opening lockfile %s failed: %s (error %d)" % (self.name, strerr, errno)
-            sys.exit(errno)
+        except IOError, (err, strerr):
+            print "ERROR: opening lockfile %s failed: %s (error %d)" % (self.name, strerr, err)
+            sys.exit(err)
         self.rc = fcntl.flock(self.file, self.mode)
 
 
@@ -146,10 +146,10 @@
     pkglist = []
     try:
         pkglist = file(runfilename).read().splitlines()
-    except IOError, (errno, strerr):
-        if errno != 2:  # everything but file_not_found is unexpected
+    except IOError, (err, strerr):
+        if err != 2:  # everything but file_not_found is unexpected
             print 'ERROR: %s: %s' % (strerr,runfilename)
-            sys.exit(errno)
+            sys.exit(err)
     return pkglist
 
 
@@ -194,9 +194,9 @@
         return
     try:
         f = open(fname,'w')
-    except IOError, (errno, strerr):
+    except IOError, (err, strerr):
         print 'ERROR: %s: %s' % (strerr,fname)
-        sys.exit(errno)  # fatal for our needs
+        sys.exit(err)  # fatal for our needs
     f.close()
 
 
@@ -368,9 +368,9 @@
     runfilename = getrunfilename(dist)
     try:
         rundirfile = open(runfilename,'a')
-    except IOError, (errno, strerr):
+    except IOError, (err, strerr):
         print 'ERROR: %s: %s' % (strerr,runfilename)
-        sys.exit(errno)
+        sys.exit(err)
 
     distdir = '%s-%s-%s' % (distro, dist, project)
     needsign = os.path.join(stagesdir, distdir)
@@ -389,9 +389,9 @@
         sys.stdout.flush()
         repolock.lock()
         print 'OK'
-    except IOError, (errno, strerr):
-        print "ERROR: lockfile %s failure: %s (error %d)" % (repolockname, strerr, errno)
-        sys.exit(errno)
+    except IOError, (err, strerr):
+        print "ERROR: lockfile %s failure: %s (error %d)" % (repolockname, strerr, err)
+        sys.exit(err)
         
     prune_needsign_tree(needsign)
     files = find_files(needsign)
@@ -434,7 +434,8 @@
                 shutil.rmtree(signtmpdir)
             sys.exit(errno.EIO)
 
-    # At this point, we have copies of all rpms below signtmpdir.
+    # At this point, we have copies of all rpms below signtmpdir,
+    # including their full source path.
     # We prefix every previously found file with signtmpdir, so
     # that we work on the temporary copy and not in the original
     # plague-results directory.