pld-ftp-admin: modules/common.py, scripts/gen-indexes.py, scripts/...

[mmazur]

Author: mmazur                       Date: Mon Jun 20 22:27:11 2005 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- start all error strings with 'ERR:'

---- Files affected:
pld-ftp-admin/modules:
   common.py (1.8 -> 1.9) 
pld-ftp-admin/scripts:
   gen-indexes.py (1.5 -> 1.6) , move.py (1.12 -> 1.13) , remove.py (1.4 -> 1.5) , test-move.py (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: pld-ftp-admin/modules/common.py
diff -u pld-ftp-admin/modules/common.py:1.8 pld-ftp-admin/modules/common.py:1.9
--- pld-ftp-admin/modules/common.py:1.8	Sun Mar 20 01:51:51 2005
+++ pld-ftp-admin/modules/common.py	Tue Jun 21 00:27:06 2005
@@ -11,7 +11,7 @@
 
 def checkdir(dir):
     if not fileexists(dir):
-        print config.value['ftp_dir']+'/' + dir + " does not exist"
+        print 'ERR: ' + config.value['ftp_dir']+'/' + dir + " does not exist"
         sys.exit(1)
 
 if 'HOME' in os.environ:

================================================================
Index: pld-ftp-admin/scripts/gen-indexes.py
diff -u pld-ftp-admin/scripts/gen-indexes.py:1.5 pld-ftp-admin/scripts/gen-indexes.py:1.6
--- pld-ftp-admin/scripts/gen-indexes.py:1.5	Wed May 11 13:31:18 2005
+++ pld-ftp-admin/scripts/gen-indexes.py	Tue Jun 21 00:27:06 2005
@@ -8,7 +8,7 @@
 import ftpio
 
 if len(sys.argv) < 2:
-    print "Not enough parameters given"
+    print "ERR: not enough parameters given"
     print "gen-indexes.py tree [tree2...]"
     sys.exit(1)
 
@@ -25,7 +25,7 @@
     if ftpio.lock(tree, True):
         locked.append(tree)
     else:
-        print "%s tree already locked" % tree
+        print "ERR: %s tree already locked" % tree
         for i in locked:
             ftpio.unlock(i)
         sys.exit(1)

================================================================
Index: pld-ftp-admin/scripts/move.py
diff -u pld-ftp-admin/scripts/move.py:1.12 pld-ftp-admin/scripts/move.py:1.13
--- pld-ftp-admin/scripts/move.py:1.12	Thu May  5 02:31:45 2005
+++ pld-ftp-admin/scripts/move.py	Tue Jun 21 00:27:06 2005
@@ -16,7 +16,7 @@
     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 @@
 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:

================================================================
Index: pld-ftp-admin/scripts/remove.py
diff -u pld-ftp-admin/scripts/remove.py:1.4 pld-ftp-admin/scripts/remove.py:1.5
--- pld-ftp-admin/scripts/remove.py:1.4	Thu Jan 20 18:20:25 2005
+++ pld-ftp-admin/scripts/remove.py	Tue Jun 21 00:27:06 2005
@@ -8,7 +8,7 @@
 import ftpio
 
 if len(sys.argv) < 3:
-    print "Not enough parameters given"
+    print "ERR: not enough parameters given"
     print "remove.py tree package1 [package2...]"
     sys.exit(1)
 
@@ -17,7 +17,7 @@
 ftpio.connect('remove')
 
 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)
 
 try:

================================================================
Index: pld-ftp-admin/scripts/test-move.py
diff -u pld-ftp-admin/scripts/test-move.py:1.5 pld-ftp-admin/scripts/test-move.py:1.6
--- pld-ftp-admin/scripts/test-move.py:1.5	Wed May 11 14:29:44 2005
+++ pld-ftp-admin/scripts/test-move.py	Tue Jun 21 00:27:06 2005
@@ -8,7 +8,7 @@
 import ftpio
 
 if len(sys.argv) < 4:
-    print "Not enough parameters given"
+    print "ERR: not enough parameters given"
     print "test-move.py src-tree dst-tree package [package2 package3 ...]"
     sys.exit(1)
 
@@ -18,12 +18,12 @@
 ftpio.connect('test-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:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-ftp-admin/modules/common.py?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/pld-ftp-admin/scripts/gen-indexes.py?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/pld-ftp-admin/scripts/move.py?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/pld-ftp-admin/scripts/remove.py?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/pld-ftp-admin/scripts/test-move.py?r1=1.5&r2=1.6&f=u