* scripts/mk-rescueimage.i386: Do not call sys.exit(0) from usage().

   Modify usage text to indicated productpath is required.  Remove test
   for optional productpath and just take the fourth argument (#188011).
   * scripts/mk-rescueimage.ppc:  Likewise.
   * scripts/mk-rescueimage.x86_64:  Likewise.

3 files changed, 6 insertions, 18 deletions

diff --git a/scripts/mk-rescueimage.i386 b/scripts/mk-rescueimage.i386
index 80ca08120..b384f4b11 100755
--- a/scripts/mk-rescueimage.i386
+++ b/scripts/mk-rescueimage.i386
@@ -15,9 +15,7 @@ import sys
 import string
 
 def usage():
-    print "usage: mk-rescueimage.i386 <toplevel> <dest-dir> <productname> [<productpath>]"
-    sys.exit(0)
-
+    print "usage: mk-rescueimage.i386 <toplevel> <dest-dir> <productname> <productpath>"
 
 if len(sys.argv) < 5:
     usage()
@@ -30,9 +28,7 @@ if not os.access("%s" % (sys.argv[2],), os.F_OK):
 srcdir  = sys.argv[1]
 destdir = sys.argv[2]+"/i386-rescueimage"
 productname = sys.argv[3]
-
-if len(sys.argv) > 4:
-    productpath = sys.argv[4]
+productpath = sys.argv[4]
 
 # clean and create destination directory
 os.system("rm -rf %s" % (destdir,))
diff --git a/scripts/mk-rescueimage.ppc b/scripts/mk-rescueimage.ppc
index b95494921..8cb470105 100644
--- a/scripts/mk-rescueimage.ppc
+++ b/scripts/mk-rescueimage.ppc
@@ -15,9 +15,7 @@ import sys
 import string
 
 def usage():
-    print "usage: mk-rescueimage.ppc <toplevel> <dest-dir> <productname> [<productpath>]"
-    sys.exit(0)
-
+    print "usage: mk-rescueimage.ppc <toplevel> <dest-dir> <productname> <productpath>"
 
 if len(sys.argv) < 5:
     usage()
@@ -30,9 +28,7 @@ if not os.access("%s/ppc" % (sys.argv[1],), os.F_OK):
 srcdir  = sys.argv[1]
 destdir = sys.argv[2]+"/ppc-rescueimage"
 productname = sys.argv[3]
-
-if len(sys.argv) > 4:
-    productpath = sys.argv[4]
+productpath = sys.argv[4]
 
 # clean and create destination directory
 os.system("rm -rf %s" % (destdir,))
diff --git a/scripts/mk-rescueimage.x86_64 b/scripts/mk-rescueimage.x86_64
index f96c4bbe5..9c4ccc399 100755
--- a/scripts/mk-rescueimage.x86_64
+++ b/scripts/mk-rescueimage.x86_64
@@ -15,9 +15,7 @@ import sys
 import string
 
 def usage():
-    print "usage: mk-rescueimage.x86_64 <toplevel> <dest-dir> <productname> [<productpath>]"
-    sys.exit(0)
-
+    print "usage: mk-rescueimage.x86_64 <toplevel> <dest-dir> <productname> <productpath>"
 
 if len(sys.argv) < 5:
     usage()
@@ -30,9 +28,7 @@ if not os.access("%s" % (sys.argv[2],), os.F_OK):
 srcdir  = sys.argv[1]
 destdir = sys.argv[2]+"/x86_64-rescueimage"
 productname = sys.argv[3]
-
-if len(sys.argv) > 4:
-    productpath = sys.argv[4]
+productpath = sys.argv[4]
 
 # clean and create destination directory
 os.system("rm -rf %s" % (destdir,))