pld-builder.new: PLD_Builder/request_fetcher.py, PLD_Builder/rpm_builder.py...

[arekm]

Author: arekm                        Date: Tue Sep  1 09:16:44 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- never trust cache/proxy

---- Files affected:
pld-builder.new/PLD_Builder:
   request_fetcher.py (1.26 -> 1.27) , rpm_builder.py (1.105 -> 1.106) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/request_fetcher.py
diff -u pld-builder.new/PLD_Builder/request_fetcher.py:1.26 pld-builder.new/PLD_Builder/request_fetcher.py:1.27
--- pld-builder.new/PLD_Builder/request_fetcher.py:1.26	Tue Sep  1 11:04:37 2009
+++ pld-builder.new/PLD_Builder/request_fetcher.py	Tue Sep  1 11:16:39 2009
@@ -3,6 +3,7 @@
 import string
 import signal
 import os
+import urllib
 import urllib2
 import StringIO
 import sys
@@ -40,7 +41,8 @@
     signal.signal(signal.SIGALRM, alarmalarm)
     signal.alarm(300)
     try:
-        f = urllib2.urlopen(control_url + "/max_req_no")
+        headers = urllib.urlencode( { 'Cache-Control': 'no-cache', 'Pragma': 'no-cache' } )
+        f = urllib2.urlopen(control_url + "/max_req_no", headers)
         count = int(string.strip(f.readline()))
         signal.alarm(0)
     except Exception, e:
@@ -58,7 +60,8 @@
     socket.setdefaulttimeout(240)
     signal.alarm(300)
     try:
-        f = urllib2.urlopen(control_url + "/queue.gz")
+        headers = urllib.urlencode( { 'Cache-Control': 'no-cache', 'Pragma': 'no-cache' } )
+        f = urllib2.urlopen(control_url + "/queue.gz", headers)
         signal.alarm(0)
     except Exception, e:
         signal.alarm(0)

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.105 pld-builder.new/PLD_Builder/rpm_builder.py:1.106
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.105	Mon Aug 17 12:20:04 2009
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Tue Sep  1 11:16:39 2009
@@ -5,6 +5,7 @@
 import atexit
 import time
 import string
+import urllib
 import urllib2
 
 from config import config, init_conf
@@ -57,7 +58,8 @@
     b.log_line("checking if we should skip the build")
     while not good:
         try:
-            f = urllib2.urlopen(src_url)
+            headers = urllib.urlencode( { 'Cache-Control': 'no-cache', 'Pragma': 'no-cache' } )
+            f = urllib2.urlopen(src_url, headers)
             good = True
         except urllib2.HTTPError, error:
                 return False
@@ -79,7 +81,8 @@
     good = False
     while not good:
         try:
-            f = urllib2.urlopen(src_url)
+            headers = urllib.urlencode( { 'Cache-Control': 'no-cache', 'Pragma': 'no-cache' } )
+            f = urllib2.urlopen(src_url, headers)
             good = True
         except urllib2.HTTPError, error:
             # fail in a way where cron job will retry
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request_fetcher.py?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.105&r2=1.106&f=u