pld-builder.new: PLD_Builder/rpm_builder.py - revert order

[arekm]

Author: arekm                        Date: Wed Jul 15 15:27:51 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- revert order

---- Files affected:
pld-builder.new/PLD_Builder:
   rpm_builder.py (1.99 -> 1.100) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.99 pld-builder.new/PLD_Builder/rpm_builder.py:1.100
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.99	Wed Jul 15 16:54:07 2009
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Wed Jul 15 17:27:46 2009
@@ -59,6 +59,9 @@
         try:
             f = urllib2.urlopen(src_url)
             good = True
+        except urllib2.HTTPError, error:
+                f.close()
+                return False
         except urllib2.URLError, error:
             # see errno.h
             if error.errno in [-3, 60, 61, 110, 111]:
@@ -66,9 +69,6 @@
                 continue
             else:
                 return False
-        except urllib2.HTTPError, error:
-                f.close()
-                return False
         return True
         f.close()
     return False
@@ -82,6 +82,12 @@
         try:
             f = urllib2.urlopen(src_url)
             good = True
+        except urllib2.HTTPError, error:
+            # fail in a way where cron job will retry
+            msg = "unable to fetch file, http code: %d" % error.code
+            b.log_line(msg)
+            f.close()
+            raise IOError, msg
         except urllib2.URLError, error:
             # see errno.h
             if error.errno in [-3, 60, 61, 110, 111]:
@@ -89,12 +95,6 @@
                 continue
             else:
                 raise
-        except urllib2.HTTPError, error:
-            # fail in a way where cron job will retry
-            msg = "unable to fetch file, http code: %d" % error.code
-            b.log_line(msg)
-            f.close()
-            raise IOError, msg
 
     o = chroot.popen("cat > %s" % b.src_rpm, mode = "w")
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.99&r2=1.100&f=u