- also create and upload *.uploadinfo files that contain list of files in

  current batch (these files are uploaded as last in a batch) and the name
  of adequate src.rpm
- this functionality is required for the new ftp administration scripts, since
  they will operate only on metadata placed in such files

Changed files:
    PLD_Builder/buildlogs.py -> 1.13
    PLD_Builder/file_sender.py -> 1.12
    PLD_Builder/ftp.py -> 1.9
    PLD_Builder/rpm_builder.py -> 1.28

diff --git a/PLD_Builder/buildlogs.py b/PLD_Builder/buildlogs.py
index 13d0ee5eacd87601c33f82b47d29efdf48f756d9..6c2cbfe1651b31da4f431e591fc2296993e16548 100644 (file)
--- a/PLD_Builder/buildlogs.py
+++ b/PLD_Builder/buildlogs.py
@@ -36,6 +36,7 @@ class Buildlogs_Queue:
       return """Target: %s/%s
 Builder: %s
 Time: %d
+Type: buildlog
 Requester: %s
 END
 """ % (config.buildlogs_url, l['name'], config.builder, time.time(), self.requester_email)

diff --git a/PLD_Builder/file_sender.py b/PLD_Builder/file_sender.py
index f457176917b3508829e60bbd7bd5175d32f606b4..17b637a47fbbaee3fd31a9d884eff0131fba7aa5 100644 (file)
--- a/PLD_Builder/file_sender.py
+++ b/PLD_Builder/file_sender.py
@@ -120,7 +120,11 @@ def flush_queue(dir):
     d = read_name_val(f)
     if d != None: q.append(d)
   def mycmp(x, y):
-    return cmp(x['Time'], y['Time'])
+    rc = cmp(x['Time'], y['Time'])
+    if (rc == 0):
+      return cmp(x['Type'], y['Type'])
+    else:
+      return rc
   q.sort(mycmp)
   
   error = None

diff --git a/PLD_Builder/ftp.py b/PLD_Builder/ftp.py
index 46d9dec8f7ebd35882b19fb4546518ca43a838ee..f1218ee92b9d84dc341ec1333ec609b415f8aa4b 100644 (file)
--- a/PLD_Builder/ftp.py
+++ b/PLD_Builder/ftp.py
@@ -20,22 +20,26 @@ class FTP_Queue:
 #    else:
     self.url = config.ftp_url
     
-  def add(self, file):
+  def add(self, file, type):
     # if /dev/null, say bye bye
     if self.url == "/dev/null":
       return
     name = os.path.basename(file)
     id = util.uuid()
     shutil.copy(file, path.ftp_queue_dir + id)
-    self.queue.append({'name': name, 'id': id})
+    self.queue.append({'name': name, 'id': id, 'type': type})
     st = os.stat(path.ftp_queue_dir + id)
     self.status += "%10d %s\n" % (st.st_size, name)
 
   def flush(self):
     def desc(l):
-      return "Target: %s/%s\nBuilder: %s\nTime: %d\nRequester: %s\nEND\n" % \
-                (self.url, l['name'], config.builder, time.time(), 
-                 self.requester_email)
+      return """Target: %s/%s
+Builder: %s
+Time: %d
+Type: %s
+Requester: %s
+END
+""" % (self.url, l['name'], config.builder, time.time(), l['type'], self.requester_email)
     
     for l in self.queue:
       f = open(path.ftp_queue_dir + l['id'] + ".desc", "w")
@@ -48,8 +52,8 @@ class FTP_Queue:
 
 queue = FTP_Queue()
 
-def add(f):
-  queue.add(f)
+def add(f, type="rpm"):
+  queue.add(f, type)
 
 def flush():
   queue.flush()

diff --git a/PLD_Builder/rpm_builder.py b/PLD_Builder/rpm_builder.py
index 57aeb82c8e432a643ae913e6c2709af573644de1..bc6c79924749ad310a39312f5b2e7e5fbe92efd4 100644 (file)
--- a/PLD_Builder/rpm_builder.py
+++ b/PLD_Builder/rpm_builder.py
@@ -119,7 +119,20 @@ def build_rpm(r, b):
     local = r.tmp_dir + os.path.basename(f)
     chroot.run("cat %s; rm -f %s" % (f, f), logfile = local)
     ftp.add(local)
-        
+
+  def uploadinfo(b):
+    c="arch:SRPMS:%s\n" % b.src_rpm
+    for f in b.files:
+       c=c + "arch:ARCH:%s\n" % os.path.basename(f)
+    c=c + "END\n"
+    return c
+
+  fname = r.tmp_dir + b.src_rpm + ".uploadinfo"
+  f = open(fname, "w")
+  f.write(uploadinfo(b))
+  f.close()
+  ftp.add(fname, "uploadinfo")
+
   status.pop()
 
   return res