From 18c8e93505bedbe77a23538c1c038aa45fb9a189 Mon Sep 17 00:00:00 2001 From: Mariusz Mazur Date: Wed, 8 Dec 2004 20:52:45 +0000 Subject: [PATCH] - Really move and remove files, don't just print info about it Changed files: bin/pfa-from-incoming -> 1.4 modules/ftptree.py -> 1.10 --- bin/pfa-from-incoming | 12 +++++++----- modules/ftptree.py | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bin/pfa-from-incoming b/bin/pfa-from-incoming index f6f971c..7ccd783 100644 --- a/bin/pfa-from-incoming +++ b/bin/pfa-from-incoming @@ -10,15 +10,17 @@ from baseftptree import BaseFtpTree, BasePkg cval=config.value def log(msg): - print msg + f=open(os.environ['HOME']+'/pld-ftp-admin/var/log', 'a') + f.write(msg+'\n') + f.close() def rm(file): - #os.remove() - print 'rm: '+file + os.remove(file) + #print 'rm: '+file def mv(src, dst): - #os.rename() - print "mv: %s %s" % (src, dst+'/'+src.split('/')[-1]) + os.rename(src, dst+'/'+src.split('/')[-1]) + #print "mv: %s %s" % (src, dst+'/'+src.split('/')[-1]) def findfiles(dir): def filterinfos(x): diff --git a/modules/ftptree.py b/modules/ftptree.py index deb50f8..d453b6e 100644 --- a/modules/ftptree.py +++ b/modules/ftptree.py @@ -19,12 +19,12 @@ def perror(msg): print msg def rm(file): - #os.remove() - print 'rm: '+file + os.remove(file) + #print 'rm: '+file def mv(src, dst): - #os.rename() - print "mv: %s %s" % (src, dst+'/'+src.split('/')[-1]) + os.rename(src, dst+'/'+src.split('/')[-1]) + #print "mv: %s %s" % (src, dst+'/'+src.split('/')[-1]) class Pkg(BasePkg): def __init__(self, name, tree): -- 2.44.0