- make src.builder's queue configurable

Changed files:
    modules/config.py -> 1.6
    modules/ftptree.py -> 1.18

diff --git a/modules/config.py b/modules/config.py
index c6a35767b83b427f214c9cb71e9afbd8ba1ae590..949d1484c93538fa967f67a46b348bd15574e4ca 100644 (file)
--- a/modules/config.py
+++ b/modules/config.py
@@ -28,6 +28,8 @@ incoming_dir=value['ftp_dir']+'/'+value['incoming_dir']+'/'
 test_builds_dir=value['ftp_dir']+'/'+value['test_builds_dir']+'/'
 ftp_archs=value['ftp_archs'].split(' ')
 
+builderqueue=value['builderqueue']
+
 if value['separate_noarch']=='yes':
     separate_noarch=True
 else:

diff --git a/modules/ftptree.py b/modules/ftptree.py
index 6fdc1b40040639926c475fd8fe905ecbc269cd05..47643466259cea3fe6f102bbbde270fa706de624 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -13,7 +13,7 @@ def bailoutonerror():
         raise SomeError
 
 def pinfo(msg):
-    print msg
+    print 'INFO: ' + msg
 
 def perror(msg):
     global errnum
@@ -131,6 +131,9 @@ class FtpTree(BaseFtpTree):
     def keys(self):
         return self.pkgnames
 
+    def candidates4move(self):
+        pass
+
     def testmove(self, dsttree):
         self.__checkbuild()
         self.__checkarchs(dsttree)
@@ -187,7 +190,7 @@ class FtpTree(BaseFtpTree):
         bailoutonerror()
 
     def __checkbuild(self):
-        f=urllib.urlopen('http://ep09.pld-linux.org/~builderth/queue.txt')
+        f=urllib.urlopen(config.builderqueue)
         #f=open('queue.txt')
         requests={}
         reid=re.compile(r'^.*id=(.*) pri.*$')