[master 1/1] product.img buildstamp should override distribution buildstamp (#1240238)

bcl installerbot-noreply at redhat.com
Tue Aug 11 22:02:46 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

config.read() reads all the files in the order given, so later ones with
the same keys override the earlier ones. This changes the order so that
the product.img .buildstamp can be used for re-branding.

Resolves: rhbz#1240238
---
 pyanaconda/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyanaconda/product.py b/pyanaconda/product.py
index 4b7b761..87a5fdf 100644
--- a/pyanaconda/product.py
+++ b/pyanaconda/product.py
@@ -34,7 +34,7 @@
 config.set("Main", "Version", os.environ.get("ANACONDA_PRODUCTVERSION", "bluesky"))
 
 # Now read in the .buildstamp file, wherever it may be.
-config.read(["/tmp/product/.buildstamp", "/.buildstamp", os.environ.get("PRODBUILDPATH", "")])
+config.read(["/.buildstamp", "/tmp/product/.buildstamp", os.environ.get("PRODBUILDPATH", "")])
 
 # Set up some variables we import throughout, applying a couple transforms as necessary.
 bugUrl = config.get("Main", "BugURL")


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/15bee719930b540a24f379eec95b6f3144bada6e


More information about the anaconda-patches mailing list