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

[PATCH 3/5] Remove productPath.



This hasn't been used or written to .buildstamp for two years, so its continued
use in anaconda was just an accident of us continuing to set it to a default.
---
 loader/loader.c         |   12 ------------
 loader/loader.h         |    1 -
 pyanaconda/constants.py |    1 -
 pyanaconda/image.py     |    6 ------
 pyanaconda/product.py   |    3 ---
 scripts/buildinstall    |    1 -
 scripts/mk-images       |    2 +-
 7 files changed, 1 insertions(+), 25 deletions(-)

diff --git a/loader/loader.c b/loader/loader.c
index 2f91670..187f6d0 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -264,7 +264,6 @@ void stopNewt(void) {
 }
 
 static gchar *productName = NULL;
-static gchar *productPath = NULL;
 static gchar *productArch = NULL;
 
 static void initProductInfo(void) {
@@ -277,14 +276,12 @@ static void initProductInfo(void) {
         g_error_free(fileErr);
         productName = g_strdup("anaconda");
         productArch = g_strdup("unknown architecture");
-        productPath = g_strdup("anaconda");
         return;
     }
 
     /* .buildstamp uses the first 3 lines in this format:
      *     STAMP.productArch
      *     productName
-     *     productPath
      */
     lines = g_strsplit(contents, "\n", 0);
     g_free(contents);
@@ -304,11 +301,9 @@ static void initProductInfo(void) {
         }
 
         productName = g_strdup(lines[1]);
-        productPath = g_strdup(lines[2]);
     } else {
         productName = g_strdup("anaconda");
         productArch = g_strdup("unknown architecture");
-        productPath = g_strdup("anaconda");
     }
 
     if (lines) {
@@ -332,13 +327,6 @@ char * getProductArch(void) {
     return productArch;
 }
 
-char * getProductPath(void) {
-    if (!productPath) {
-       initProductInfo();
-    }
-    return productPath;
-}
-
 void initializeConsole() {
     /* enable UTF-8 console */
     setenv("LANG", LANG_DEFAULT, 1);
diff --git a/loader/loader.h b/loader/loader.h
index 1c54c52..48317f6 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -112,7 +112,6 @@ void doExit(int) __attribute__ ((noreturn));
 void startNewt(void);
 void stopNewt(void);
 char * getProductName(void);
-char * getProductPath(void);
 char * getProductArch(void);
 
 #include "moduleinfo.h"
diff --git a/pyanaconda/constants.py b/pyanaconda/constants.py
index 43e3209..eed1d49 100644
--- a/pyanaconda/constants.py
+++ b/pyanaconda/constants.py
@@ -67,7 +67,6 @@ import product
 productName = product.productName
 productVersion = product.productVersion
 productArch = product.productArch
-productPath = product.productPath
 bugzillaUrl = product.bugUrl
 
 lvmErrorOutput = "/tmp/lvmout"
diff --git a/pyanaconda/image.py b/pyanaconda/image.py
index 9341192..ab0702e 100644
--- a/pyanaconda/image.py
+++ b/pyanaconda/image.py
@@ -68,12 +68,6 @@ def findIsoImages(path, messageWindow):
                         os.access("/mnt/cdimage/images/install.img", os.R_OK)):
                         log.warning("%s doesn't have a install.img, skipping" %(what,))
                         continue
-                    # we only install binary packages, so let's look for a
-                    # product/ dir and hope that this avoids getting
-                    # discs from the src.rpm set
-                    if not os.path.isdir("/mnt/cdimage/%s" %(productPath,)):
-                        log.warning("%s doesn't have binary RPMS, skipping" %(what,))
-                        continue
 
                     # warn user if images appears to be wrong size
                     if os.stat(what)[stat.ST_SIZE] % 2048:
diff --git a/pyanaconda/product.py b/pyanaconda/product.py
index 68df00c..e271b45 100644
--- a/pyanaconda/product.py
+++ b/pyanaconda/product.py
@@ -32,7 +32,6 @@ else:
 productStamp = ""
 productName = "anaconda"
 productVersion = "bluesky"
-productPath = "Packages"
 productArch = None
 bugUrl = "your distribution provided bug reporting tool."
 
@@ -52,8 +51,6 @@ if os.environ.has_key("ANACONDA_PRODUCTNAME"):
     productName = os.environ["ANACONDA_PRODUCTNAME"]
 if os.environ.has_key("ANACONDA_PRODUCTVERSION"):
     productVersion = os.environ["ANACONDA_PRODUCTVERSION"]
-if os.environ.has_key("ANACONDA_PRODUCTPATH"):
-    productPath = os.environ["ANACONDA_PRODUCTPATH"]
 if os.environ.has_key("ANACONDA_PRODUCTARCH"):
     productArch = os.environ["ANACONDA_PRODUCTARCH"]
 if os.environ.has_key("ANACONDA_BUGURL"):
diff --git a/scripts/buildinstall b/scripts/buildinstall
index 36bb32c..8a5f4fa 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -33,7 +33,6 @@ usage() {
 }
 
 CWD="$(pwd)"
-PRODUCTPATH="anaconda"
 
 while [ $# -gt 0 ]; do
     case $1 in
diff --git a/scripts/mk-images b/scripts/mk-images
index eb1437b..4286fc0 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -25,7 +25,7 @@ IMAGEUUID=$(date +%Y%m%d%H%M).$(uname -i)
 TMPDIR=${TMPDIR:-/tmp}
 
 usage () {
-    echo "usage: mk-images <pkgsrc> <toplevel> <template> <imgdir> <buildarch> <productname> <version> [<productpath>]"
+    echo "usage: mk-images <pkgsrc> <toplevel> <template> <imgdir> <buildarch> <productname> <version>"
     exit 0
 }
 
-- 
1.7.1.1


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