- all scripts use ftpiod for locking and logging

[projects/pld-ftp-admin.git] / bin / pfa-testmvpkg

diff --git a/bin/pfa-testmvpkg b/bin/pfa-testmvpkg
index 3c0f1238a5f1c2296e9e78dc65adf105c74e4392..2c1a6cdb82b404f9a622738a704cd41080390060 100755 (executable)
--- a/bin/pfa-testmvpkg
+++ b/bin/pfa-testmvpkg
@@ -5,6 +5,7 @@ import sys, os
 sys.path.insert(0, os.environ['HOME']+'/pld-ftp-admin/modules')
 from ftptree import FtpTree
 from common import checkdir
+import ftpio
 
 if len(sys.argv) < 3:
     print "Not enough parameters given"
@@ -14,9 +15,24 @@ if len(sys.argv) < 3:
 checkdir(sys.argv[1])
 checkdir(sys.argv[2])
 
+ftpio.connect('test-move')
+
+if not ftpio.lock(sys.argv[1], True):
+    print "%s tree already locked" %s sys.argv[1]
+    sys.exit(1)
+
+if not ftpio.lock(sys.argv[2], True):
+    ftpio.unlock(sys.argv[1])
+    print "%s tree already locked" %s sys.argv[2]
+    sys.exit(1)
+
+# We don't 'try' as in move.py cause these functions don't force exit
 srctree=FtpTree(sys.argv[1], loadall=True)
 dsttree=FtpTree(sys.argv[2])
 srctree.mark4moving(sys.argv[3:])
 
 srctree.testmove(dsttree)
 
+ftpio.unlock(sys.argv[1])
+ftpio.unlock(sys.argv[2])
+