pld-builder.new: PLD_Builder/rpm_builder.py - getcode() unavilable on pytho...

arekm arekm at pld-linux.org
Wed Jul 15 15:36:44 CEST 2009


Author: arekm                        Date: Wed Jul 15 13:36:44 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- getcode() unavilable on python 2.4

---- Files affected:
pld-builder.new/PLD_Builder:
   rpm_builder.py (1.92 -> 1.93) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.92 pld-builder.new/PLD_Builder/rpm_builder.py:1.93
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.92	Wed Jul 15 15:28:01 2009
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Wed Jul 15 15:36:39 2009
@@ -65,7 +65,7 @@
                 continue
             else:
                 return False
-        if f.getcode() == 200:
+        if f.has_attr('getcode') and f.getcode() == 200:
             f.close()
             return True
         f.close()
@@ -86,13 +86,14 @@
                 continue
             else:
                 raise
-        http_code = f.getcode()
-        if http_code != 200:
-                # fail in a way where cron job will retry
-                msg = "unable to fetch file, http code: %d" % http_code
-                b.log_line(msg)
-                f.close()
-                raise IOError, msg
+        if f.has_attr('getcode'):
+            http_code = f.getcode()
+            if http_code != 200:
+                    # fail in a way where cron job will retry
+                    msg = "unable to fetch file, http code: %d" % http_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.92&r2=1.93&f=u



More information about the pld-cvs-commit mailing list