- 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

diff --git a/bin/pfa-from-incoming b/bin/pfa-from-incoming
index f6f971c095f7f342386e6fd08ab502d24952837e..7ccd783e38c1491fea1c097720db6f29e8555c1d 100644 (file)
--- 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 deb50f86fe5e4a94eb1bebc605f8113a293885f7..d453b6ec906b0e29bf351ae173f978008a477ecc 100644 (file)
--- 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):