pld-ftp-admin: modules/config.py, modules/ftptree.py - make src.bu...

[mmazur]

Author: mmazur                       Date: Thu Jul 14 19:34:37 2005 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- make src.builder's queue configurable

---- Files affected:
pld-ftp-admin/modules:
   config.py (1.5 -> 1.6) , ftptree.py (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: pld-ftp-admin/modules/config.py
diff -u pld-ftp-admin/modules/config.py:1.5 pld-ftp-admin/modules/config.py:1.6
--- pld-ftp-admin/modules/config.py:1.5	Wed May 11 13:31:18 2005
+++ pld-ftp-admin/modules/config.py	Thu Jul 14 21:34:32 2005
@@ -28,6 +28,8 @@
 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:

================================================================
Index: pld-ftp-admin/modules/ftptree.py
diff -u pld-ftp-admin/modules/ftptree.py:1.17 pld-ftp-admin/modules/ftptree.py:1.18
--- pld-ftp-admin/modules/ftptree.py:1.17	Fri May 20 15:12:24 2005
+++ pld-ftp-admin/modules/ftptree.py	Thu Jul 14 21:34:32 2005
@@ -13,7 +13,7 @@
         raise SomeError
 
 def pinfo(msg):
-    print msg
+    print 'INFO: ' + msg
 
 def perror(msg):
     global errnum
@@ -131,6 +131,9 @@
     def keys(self):
         return self.pkgnames
 
+    def candidates4move(self):
+        pass
+
     def testmove(self, dsttree):
         self.__checkbuild()
         self.__checkarchs(dsttree)
@@ -187,7 +190,7 @@
         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.*$')
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-ftp-admin/modules/config.py?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/pld-ftp-admin/modules/ftptree.py?r1=1.17&r2=1.18&f=u