extras-buildsys/utils extras-push-new,1.26,1.27

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- extras-push-new	9 Jun 2006 08:30:33 -0000	1.26
+++ extras-push-new	9 Jun 2006 08:47:32 -0000	1.27
@@ -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
 
 
@@ -340,9 +340,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)
@@ -354,9 +354,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)