pld-ftp-admin: scripts/from-incoming.py Don't fail when rming file...
arekm
arekm at pld-linux.org
Sun Dec 18 20:02:42 CET 2005
Author: arekm Date: Sun Dec 18 19:02:41 2005 GMT
Module: pld-ftp-admin Tag: HEAD
---- Log message:
Don't fail when rming file is not possible (because file already doesn't exist). Just log that as possible problem.
---- Files affected:
pld-ftp-admin/scripts:
from-incoming.py (1.9 -> 1.10)
---- Diffs:
================================================================
Index: pld-ftp-admin/scripts/from-incoming.py
diff -u pld-ftp-admin/scripts/from-incoming.py:1.9 pld-ftp-admin/scripts/from-incoming.py:1.10
--- pld-ftp-admin/scripts/from-incoming.py:1.9 Sun Sep 11 16:45:00 2005
+++ pld-ftp-admin/scripts/from-incoming.py Sun Dec 18 20:02:36 2005
@@ -168,7 +168,12 @@
if dstpkg.files.has_key(arch):
ftpio.log("files from %s for arch %s already present in %s; removing newer files" % (`srcpkg`, arch, ftptree))
for rpm in srcpkg.files['ARCH']:
- rm(incoming_dir+arch+'/'+rpm)
+ try:
+ rm(incoming_dir+arch+'/'+rpm)
+ except OSError, e:
+ l = "Removing %s problem: %s" % (incoming_dir+arch+'/'+rpm, e)
+ ftpio.log(l)
+ print l
rm(incoming_dir+arch+'/'+uploadinfo)
continue
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pld-ftp-admin/scripts/from-incoming.py?r1=1.9&r2=1.10&f=u
More information about the pld-cvs-commit
mailing list