- merged PLD changes

[tld-ftp-admin.git] / bin / pfa-testmvpkg

diff --git a/bin/pfa-testmvpkg b/bin/pfa-testmvpkg
index c35c71ee1e0d394b5c7490f94bb11e6b066fb592..ba2b3ce03d198645191f7d936cdd5d3f5fa1f500 100755 (executable)
--- a/bin/pfa-testmvpkg
+++ b/bin/pfa-testmvpkg
@@ -1,6 +1,8 @@
-#!/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']+'/tld-ftp-admin/modules')
 import ftptree
@@ -9,8 +11,8 @@ 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])
@@ -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: