pld-ftp-admin: scripts/from-incoming.py Skip (until next round) moving srpm...

[arekm]

Author: arekm                        Date: Thu Jan 27 11:47:17 2011 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
Skip (until next round) moving srpm or arch part of pkg if some file is missing.

---- Files affected:
pld-ftp-admin/scripts:
   from-incoming.py (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: pld-ftp-admin/scripts/from-incoming.py
diff -u pld-ftp-admin/scripts/from-incoming.py:1.20 pld-ftp-admin/scripts/from-incoming.py:1.21
--- pld-ftp-admin/scripts/from-incoming.py:1.20	Fri Jun 12 00:50:58 2009
+++ pld-ftp-admin/scripts/from-incoming.py	Thu Jan 27 12:47:12 2011
@@ -140,6 +140,10 @@
     pkg = BasePkg(uploadinfo[:-19], content = content)
     srpm = pkg.files['SRPMS'][0]
 
+    if not os.path.exists(incoming_dir + 'SRPMS/' + srpm):
+        ftpio.log("%s file missing; skipping move until next round" % (srpm))
+        continue
+
     if ftptree.has_key(`pkg`):
         ftpio.log("%s already present in %s; removing newer files" % (srpm, ftptree))
         rm(incoming_dir + 'SRPMS/' + srpm)
@@ -170,6 +174,12 @@
 
         if not ftptree.has_key(`srcpkg`):
             continue # We require the src.rpm to be present
+
+        rpmfile_missing = [f for f in srcpkg.files['ARCH'] if not os.path.exists(incoming_dir + arch + '/'+f)]
+        if len(rpmfile_missing):
+            for filem in rpmfile_missing:
+                ftpio.log("%s file missing; skipping move until next round" % (filem))
+            continue
 
         dstpkg = BasePkg(`srcpkg`, ftptree)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/scripts/from-incoming.py?r1=1.20&r2=1.21&f=u