diff options
author | Jeremy Katz <katzj@redhat.com> | 2005-03-29 18:19:47 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2005-03-29 18:19:47 +0000 |
commit | d1b36584b8c52530156c18d5bd3b031f86b382ea (patch) | |
tree | 49c5c925abf004c3e4d5b9e142506432c29856ef /scripts | |
parent | 916b4c6757fb50b5b9db8710f5a572a0c00b870b (diff) | |
download | anaconda-d1b36584b8c52530156c18d5bd3b031f86b382ea.tar.gz anaconda-d1b36584b8c52530156c18d5bd3b031f86b382ea.tar.xz anaconda-d1b36584b8c52530156c18d5bd3b031f86b382ea.zip |
2005-03-29 Jeremy Katz <katzj@redhat.com>
* scripts/buildinstall (PRODUCTPATH): Product path simplification.
* scripts/pkgorder: Likewise.
* scripts/mk-rescueimage.x86_64 (productname): Likewise.
* scripts/mk-rescueimage.i386 (productname): Likewise.
* scripts/mk-images (PRODUCTPATH): Likewise.
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/buildinstall | 3 | ||||
-rwxr-xr-x | scripts/mk-images | 6 | ||||
-rwxr-xr-x | scripts/mk-rescueimage.i386 | 4 | ||||
-rwxr-xr-x | scripts/mk-rescueimage.x86_64 | 4 | ||||
-rwxr-xr-x | scripts/pkgorder | 4 | ||||
-rw-r--r-- | scripts/splittree.py | 2 |
6 files changed, 7 insertions, 16 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall index 66ca55dcb..c63861adb 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -5,9 +5,8 @@ usage() { exit 1 } -COMPNAME=dist-7.0 RUN=1 -PRODUCTPATH="RedHat" +PRODUCTPATH="anaconda" while [ $# -gt 0 ]; do case $1 in diff --git a/scripts/mk-images b/scripts/mk-images index 404d8621a..66345ad23 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -19,11 +19,7 @@ if [ -z "$1" -o -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" -o -z "$6" -o -z "$7" ] PRODUCT=$6 VERSION=$7 -if [ -z "$8" ]; then - PRODUCTPATH="RedHat" -else - PRODUCTPATH=$8 -fi +PRODUCTPATH=$8 TOPDIR=$(echo $0 | sed "s,/[^/]*$,,") if [ $TOPDIR = $0 ]; then diff --git a/scripts/mk-rescueimage.i386 b/scripts/mk-rescueimage.i386 index 3096ac00a..fdc8810df 100755 --- a/scripts/mk-rescueimage.i386 +++ b/scripts/mk-rescueimage.i386 @@ -19,7 +19,7 @@ def usage(): sys.exit(0) -if len(sys.argv) < 4: +if len(sys.argv) < 5: usage() sys.exit(1) @@ -33,8 +33,6 @@ productname = sys.argv[3] if len(sys.argv) > 4: productpath = sys.argv[4] -else: - productpath = "RedHat" # 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 bae15d993..38939ea6b 100755 --- a/scripts/mk-rescueimage.x86_64 +++ b/scripts/mk-rescueimage.x86_64 @@ -19,7 +19,7 @@ def usage(): sys.exit(0) -if len(sys.argv) < 4: +if len(sys.argv) < 5: usage() sys.exit(1) @@ -33,8 +33,6 @@ productname = sys.argv[3] if len(sys.argv) > 4: productpath = sys.argv[4] -else: - productpath = "RedHat" # clean and create destination directory os.system("rm -rf %s" % (destdir,)) diff --git a/scripts/pkgorder b/scripts/pkgorder index 3685da9e2..11633868d 100755 --- a/scripts/pkgorder +++ b/scripts/pkgorder @@ -151,7 +151,7 @@ while n < len(sys.argv): args.append(arg) if len(args) < 3: - print "pkgorder <toppath> <arch>" + print "pkgorder <toppath> <arch> <productpath>" sys.exit(1) distDir = os.path.normpath(args[1]) @@ -165,7 +165,7 @@ if productPath is None: if len(args) > 3: productPath = args[3] else: - productPath = "RedHat" + raise RuntimeError, "no product path specified" if not os.path.isdir(distDir): print "error: %s is not a directory" % distDir diff --git a/scripts/splittree.py b/scripts/splittree.py index 67dc70883..93587226a 100644 --- a/scripts/splittree.py +++ b/scripts/splittree.py @@ -46,7 +46,7 @@ class Timber: """Split trees like no other""" def __init__(self): - """self.release_str : the name and version of the product, ie "Red Hat Linux 9" + """self.release_str : the name and version of the product" self.package_order_file : the location of the file which has the package ordering |