Author: mmazur Date: Sun Feb 27 11:37:57 2005 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- maintainer uploads rpmqa now
---- Files affected:
pld-builder.new/PLD_Builder:
config.py (1.29 -> 1.30) , ftp.py (1.12 -> 1.13) , maintainer.py (1.5 ->
1.6)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/config.py
diff -u pld-builder.new/PLD_Builder/config.py:1.29
pld-builder.new/PLD_Builder/config.py:1.30
--- pld-builder.new/PLD_Builder/config.py:1.29 Sun Feb 27 11:11:23 2005
+++ pld-builder.new/PLD_Builder/config.py Sun Feb 27 12:37:52 2005
@@ -86,6 +86,7 @@
self.ftp_url = get("ftp_url")
self.test_ftp_url = get("test_ftp_url", "/dev/null")
self.rpmqa_url = get("rpmqa_url", "/dev/null")
+ self.rpmqa_filename = get("rpmqa_filename")
self.job_slots = int(get("job_slots"))
self.max_load = float(get("max_load"))
self.control_url = get("control_url")
================================================================
Index: pld-builder.new/PLD_Builder/ftp.py
diff -u pld-builder.new/PLD_Builder/ftp.py:1.12
pld-builder.new/PLD_Builder/ftp.py:1.13
--- pld-builder.new/PLD_Builder/ftp.py:1.12 Sat Feb 26 15:00:16 2005
+++ pld-builder.new/PLD_Builder/ftp.py Sun Feb 27 12:37:52 2005
@@ -14,13 +14,17 @@
self.some_failed = 0
self.status = ""
- def init(self, g):
+ def init(self, g=None, rpmqa=False):
self.queue = []
- self.requester_email = g.requester_email
- if "test-build" in g.flags:
- self.url = config.test_ftp_url
+ if rpmqa:
+ self.requester_email = config.admin_email
+ self.url = config.rpmqa_url
else:
- self.url = config.ftp_url
+ self.requester_email = g.requester_email
+ if "test-build" in g.flags:
+ self.url = config.test_ftp_url
+ else:
+ self.url = config.ftp_url
def add(self, file, type):
# if /dev/null, say bye bye
@@ -63,8 +67,8 @@
def kill():
queue.kill()
-def init(r):
- queue.init(r)
+def init(r=None, rpmqa=False):
+ queue.init(r, rpmqa)
def status():
return queue.status
================================================================
Index: pld-builder.new/PLD_Builder/maintainer.py
diff -u pld-builder.new/PLD_Builder/maintainer.py:1.5
pld-builder.new/PLD_Builder/maintainer.py:1.6
--- pld-builder.new/PLD_Builder/maintainer.py:1.5 Sun Feb 20 15:21:20 2005
+++ pld-builder.new/PLD_Builder/maintainer.py Sun Feb 27 12:37:52 2005
@@ -1,11 +1,13 @@
# vi: encoding=utf-8 ts=8 sts=4 sw=4 et
-from config import config, init_conf
-import path
import os
import time
+
+from config import config, init_conf
import util
import chroot
+import ftp
+import path
def clean_dir(path, max):
curtime=time.time()
@@ -16,10 +18,24 @@
else:
os.unlink(path+'/'+i)
+def send_rpmqa():
+ tmp = path.build_dir + util.uuid() + '/'
+ os.mkdir(tmp)
+ log = tmp + config.rpmqa_filename
+ chroot.run("rpm -qa|sort", logfile=log)
+ os.chmod(log,0644)
+ ftp.init(rpmqa=True)
+ ftp.add(log)
+ ftp.flush()
+ os.unlink(log)
+ os.rmdir(tmp)
+
def handle_src():
+ send_rpmqa()
clean_dir(path.www_dir+'srpms', 2592000) # a month
def handle_bin():
+ send_rpmqa()
f=chroot.popen("""ls -l --time-style +%s /spools/ready""", 'root')
rmpkgs=[]
curtime=time.time()
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/config.py?r1=1.29&r2=1.30&f=u
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/ftp.py?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/maintainer.py?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
