- start all error strings with 'ERR:'

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

diff --git a/bin/pfa-mvpkg b/bin/pfa-mvpkg
index 024bddc76f7f9675b91ac48bef099ad3f08ba281..eb331aa0c1776b822ec93ccbe7b1fc1edf7f39ba 100644 (file)
--- a/bin/pfa-mvpkg
+++ b/bin/pfa-mvpkg
@@ -16,7 +16,7 @@ if len(sys.argv) > 4 and sys.argv[1]=='-nb':
     sys.argv=sys.argv[1:]
 
 if len(sys.argv) < 4:
-    print "Not enough parameters given"
+    print "ERR: not enough parameters given"
     print "move.py [options] src-tree dst-tree package [package2 package3 ...]"
     print "\nOptions:"
     print "      -nb    Do not check if builds are finished.\n"
@@ -28,12 +28,12 @@ checkdir(sys.argv[2])
 ftpio.connect('move')
 
 if not ftpio.lock(sys.argv[1], True):
-    print "%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 "%s tree already locked" % sys.argv[2]
+    print "ERR: %s tree already locked" % sys.argv[2]
     sys.exit(1)
 
 try:
@@ -74,7 +74,7 @@ m.write(('SrcTree: %s                               DstTree: %s\n' +
        'Amount: %d\n\n---- Moved:\n\n') % (sys.argv[1], sys.argv[2], len(pkgs)))
 
 for name in sorted(pkgs.keys()):
-    m.write_line('%s: %s' % (name, ', '.join(pkgs[name])))
+    m.write_line('%s ---- %s' % (name, ', '.join(pkgs[name])))
 
 m.send()