X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=bin%2Fpfa-testmvpkg;h=65f690b0ad2db89c1d965ebd0670c947644531e9;hb=d2c0dc422251cf4d0fb56d4d0e3f792991c9cd79;hp=53a0e4860d1b28e31cf0f62713f87f23ee569934;hpb=72b522a24f2dcde856f1d66b34476aebe13ec4fc;p=tld-ftp-admin.git

diff --git a/bin/pfa-testmvpkg b/bin/pfa-testmvpkg
index 53a0e48..65f690b 100755
--- a/bin/pfa-testmvpkg
+++ b/bin/pfa-testmvpkg
@@ -1,23 +1,25 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
+from __future__ import print_function
+
 import sys, os
-sys.path.insert(0, os.environ['HOME']+'/pld-ftp-admin/modules')
+sys.path.insert(0, os.environ['HOME']+'/tld-ftp-admin/modules')
 import ftptree
 from common import checkdir
 import ftpio
 from config import archived_trees, logs_list
 
 if len(sys.argv) < 4:
-    print "ERR: not enough parameters given"
-    print "test-move.py src-tree dst-tree package [package2 package3 ...]"
+    print("ERR: not enough parameters given")
+    print("test-move.py src-tree dst-tree package [package2 package3 ...]")
     sys.exit(1)
 
 checkdir(sys.argv[1])
 checkdir(sys.argv[2])
 
 if sys.argv[2] in archived_trees:
-    archivetreename = ".archive/" + sys.argv[2]
+    archivetreename = "archive"
     checkdir(archivetreename)
 else:
     archivetreename = None
@@ -25,18 +27,18 @@ else:
 ftpio.connect('test-move')
 
 if not ftpio.lock(sys.argv[1], True):
-    print "ERR: %s tree already locked" % sys.argv[1]
+    print("ERR: %s tree already locked" % sys.argv[1])
     sys.exit(1)
 
 if not ftpio.lock(sys.argv[2], True):
     ftpio.unlock(sys.argv[1])
-    print "ERR: %s tree already locked" % sys.argv[2]
+    print("ERR: %s tree already locked" % sys.argv[2])
     sys.exit(1)
 
 if archivetreename != None and archivetreename != sys.argv[1] and not ftpio.lock(archivetreename, True):
     ftpio.unlock(sys.argv[2])
     ftpio.unlock(sys.argv[1])
-    print "ERR: %s tree already locked" % archivetreename
+    print("ERR: %s tree already locked" % archivetreename)
     sys.exit(1)
 
 try: