X-Git-Url: https://git.tld-linux.org/?p=tld-ftp-admin.git;a=blobdiff_plain;f=bin%2Fpfa-mvpkg;h=a10367028f2086778190965576c6f895ccc78219;hp=dc225d165bf76507f8374dd0f616031b39cbe411;hb=51b9814081f743180ffed6c80fd7945acb554ce2;hpb=f7b22268ab563fa906be0653d037f1805e220e5c

diff --git a/bin/pfa-mvpkg b/bin/pfa-mvpkg
index dc225d1..a103670 100755
--- a/bin/pfa-mvpkg
+++ b/bin/pfa-mvpkg
@@ -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,7 +11,7 @@ import ftpio
 from mailer import Message
 from config import archived_trees, logs_list
 
-os.umask(022)
+os.umask(0o022)
 
 nocheckbuild = False
 if len(sys.argv) > 4 and sys.argv[1] == '-nb':
@@ -17,10 +19,10 @@ if len(sys.argv) > 4 and sys.argv[1] == '-nb':
     sys.argv = sys.argv[1:]
 
 if len(sys.argv) < 4:
-    print >>sys.stderr, "ERR: not enough parameters given"
-    print >>sys.stderr, "move.py [options] src-tree dst-tree package [package2 package3 ...]"
-    print >>sys.stderr, "\nOptions:"
-    print >>sys.stderr, "      -nb    Do not check if builds are finished.\n"
+    print("ERR: not enough parameters given", file=sys.stderr)
+    print("move.py [options] src-tree dst-tree package [package2 package3 ...]", file=sys.stderr)
+    print("\nOptions:", file=sys.stderr)
+    print("      -nb    Do not check if builds are finished.\n", file=sys.stderr)
     sys.exit(1)
 
 checkdir(sys.argv[1])
@@ -35,18 +37,18 @@ else:
 ftpio.connect('move')
 
 if not ftpio.lock(sys.argv[1], True):
-    print >>sys.stderr, "ERR: %s tree already locked" % sys.argv[1]
+    print("ERR: %s tree already locked" % sys.argv[1], file=sys.stderr)
     sys.exit(1)
 
 if not ftpio.lock(sys.argv[2], True):
     ftpio.unlock(sys.argv[1])
-    print >>sys.stderr, "ERR: %s tree already locked" % sys.argv[2]
+    print("ERR: %s tree already locked" % sys.argv[2], file=sys.stderr)
     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, file=sys.stderr)
     sys.exit(1)
 
 try:
@@ -78,7 +80,7 @@ if archivetreename != None and archivetreename != sys.argv[1]:
 if logs_list == None:
     sys.exit(0)
 
-print 'Sending mail notification to %s...' % logs_list
+print('Sending mail notification to %s...' % logs_list)
 
 pkgs = {}
 
@@ -92,7 +94,7 @@ for pkg in srctree.marked4moving:
 ftpadmin = "(unknown)"
 try:
     ftpadmin = os.environ['FTPADM']
-except KeyError, e:
+except KeyError as e:
     pass
 m = Message()
 m.set_headers(
@@ -117,4 +119,4 @@ for nvr in sorted(pkgs.keys()):
 
 m.send()
 
-print 'done.'
+print('done.')