From 749b120d2a5b3aeea11c156694157de89d835ee1 Mon Sep 17 00:00:00 2001 From: Mariusz Mazur Date: Mon, 20 Jun 2005 22:27:06 +0000 Subject: [PATCH] - start all error strings with 'ERR:' Changed files: bin/pfa-genindex -> 1.6 bin/pfa-mvpkg -> 1.13 bin/pfa-rmpkg -> 1.5 bin/pfa-testmvpkg -> 1.6 modules/common.py -> 1.9 --- bin/pfa-genindex | 4 ++-- bin/pfa-mvpkg | 6 +++--- bin/pfa-rmpkg | 4 ++-- bin/pfa-testmvpkg | 6 +++--- modules/common.py | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/pfa-genindex b/bin/pfa-genindex index bee4bde..2499503 100644 --- a/bin/pfa-genindex +++ b/bin/pfa-genindex @@ -8,7 +8,7 @@ from config import ftp_dir,all_ftp_archs 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 @@ for tree in trees: 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) diff --git a/bin/pfa-mvpkg b/bin/pfa-mvpkg index 7f8c0e2..eb331aa 100644 --- 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: diff --git a/bin/pfa-rmpkg b/bin/pfa-rmpkg index bfcec7a..5fa6ed2 100755 --- a/bin/pfa-rmpkg +++ b/bin/pfa-rmpkg @@ -8,7 +8,7 @@ from common import checkdir 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 @@ checkdir(sys.argv[1]) 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: diff --git a/bin/pfa-testmvpkg b/bin/pfa-testmvpkg index acd1667..8364e2e 100755 --- a/bin/pfa-testmvpkg +++ b/bin/pfa-testmvpkg @@ -8,7 +8,7 @@ from common import checkdir 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 @@ checkdir(sys.argv[2]) 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: diff --git a/modules/common.py b/modules/common.py index 700005f..d36242b 100644 --- a/modules/common.py +++ b/modules/common.py @@ -11,7 +11,7 @@ def fileexists(path): 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: -- 2.44.0