[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 09/11] Remove support for writing disc number info to .treeinfo and .discinfo.



---
 scripts/buildinstall    |    4 ++--
 scripts/makestamp.py    |   15 ---------------
 scripts/maketreeinfo.py |   14 --------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/scripts/buildinstall b/scripts/buildinstall
index 205a91e..65e5fb3 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -28,7 +28,7 @@ die() {
 }
 
 usage() {
-    echo "Usage: buildinstall --version <version> --brand <brand> --product <product> --release <comment> [--output outputdir] [--discs <discstring>] <root>" >&2
+    echo "Usage: buildinstall --version <version> --brand <brand> --product <product> --release <comment> [--output outputdir] <root>" >&2
     exit 1
 }
 
@@ -248,7 +248,7 @@ echo $MK_IMAGES $DEBUGSTR $NOGRSTR --isbeta=$ISBETA --imgdir $TREEDIR/install --
 $MK_IMAGES $DEBUGSTR $NOGRSTR --isbeta=$ISBETA --imgdir $TREEDIR/install --arch $BASEARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf || die "image creation failed"
 
 echo "Writing .discinfo file"
-$MK_STAMP --releasestr="$RELEASESTR" --arch=$BASEARCH --discNum="ALL"  --outfile=$OUTPUT/.discinfo
+$MK_STAMP --releasestr="$RELEASESTR" --arch=$BASEARCH --outfile=$OUTPUT/.discinfo
 
 rm -rf $TREEDIR $BUILDINSTDIR
 rm -f $yumconf
diff --git a/scripts/makestamp.py b/scripts/makestamp.py
index 0638c6d..43bb5c7 100755
--- a/scripts/makestamp.py
+++ b/scripts/makestamp.py
@@ -33,14 +33,11 @@ def usage():
 data = {"timestamp": None,
         "releasestr": None,
         "arch": None,
-        "discNum": None,
         "outfile": None}
-allDiscs = None
 
 opts = []
 for key in data.keys():
     opts.append("%s=" % (key,))
-opts.append("allDiscs")
 
 (args, extra) = getopt.getopt(sys.argv[1:], '', opts)
 if len(extra) > 0:
@@ -50,8 +47,6 @@ if len(extra) > 0:
 for (str, arg) in args:
     if str[2:] in data.keys():
         data[str[2:]] = arg
-    elif str == "--allDiscs":
-        allDiscs = 1
     else:
 	print("unknown str of ", str)
         usage()
@@ -69,10 +64,6 @@ if data["releasestr"] is None:
 if data["arch"] is None:
     print("What arch is this disc for?")
     data["arch"] = sys.stdin.readline()[:-1]
-    
-if data["discNum"] is None and allDiscs is None:
-    sys.stderr.write("No disc number specified; assuming disc 1\n")
-    data["discNum"] = "1"
 
 if data["outfile"] is None:
     f = sys.stdout
@@ -82,9 +73,3 @@ else:
 f.write("%f\n" % data["timestamp"])
 f.write("%s\n" % data["releasestr"])
 f.write("%s\n" % data["arch"])
-if allDiscs is None:
-    f.write("%s\n" % data["discNum"])
-else:
-    f.write("0\n")
-
-    
diff --git a/scripts/maketreeinfo.py b/scripts/maketreeinfo.py
index 226d513..1dd0c49 100644
--- a/scripts/maketreeinfo.py
+++ b/scripts/maketreeinfo.py
@@ -41,16 +41,12 @@ data = {"timestamp": time.time(),
         "variant": None,
         "version": None,
         "arch": None,
-        "discnum": None,
-        "totaldiscs": None,
         "packagedir": None,
         "outfile": None}
-allDiscs = None
 
 opts = []
 for key in data.keys():
     opts.append("%s=" % (key,))
-opts.append("allDiscs")
 
 (args, extra) = getopt.getopt(sys.argv[1:], '', opts)
 if len(extra) > 0:
@@ -60,8 +56,6 @@ if len(extra) > 0:
 for (str, arg) in args:
     if str[2:] in data.keys():
         data[str[2:]] = arg
-    elif str == "--allDiscs":
-        allDiscs = 1
     else:
 	print("unknown str of ", str)
         usage()
@@ -86,14 +80,6 @@ if data["arch"] is None:
     sys.stderr.write("--arch missing! This is probably bad!\n")
     data["arch"] = ""
 
-if data["discnum"] is None and allDiscs is None:
-    sys.stderr.write("--discnum missing; assuming disc 1\n")
-    data["discnum"] = "1"
-
-if data["totaldiscs"] is None and allDiscs is None:
-    sys.stderr.write("--totaldiscs missing; assuming 1\n")
-    data["totaldiscs"] = "1"
-
 if data["packagedir"] is None:
     sys.stderr.write("--packagedir missing. This might cause some weirdness.\n")
     data["packagedir"] = ""
-- 
1.7.1.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]