[master 1/1] Fix bug with product DataHolder overwriting product string.
bcl
installerbot-noreply at redhat.com
Mon May 18 15:28:40 UTC 2015
From: "Brian C. Lane" <bcl at redhat.com>
---
src/pylorax/__init__.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py
index e83635b..882be66 100644
--- a/src/pylorax/__init__.py
+++ b/src/pylorax/__init__.py
@@ -237,14 +237,13 @@ def run(self, dbo, product, version, release, variant="", bugurl="",
logger.debug("self.arch.%s = %s", attr, getattr(self.arch,attr))
logger.info("setting up build parameters")
- product = DataHolder(name=product, version=version, release=release,
- variant=variant, bugurl=bugurl, isfinal=isfinal)
- self.product = product
- logger.debug("product data: %s", product)
+ self.product = DataHolder(name=product, version=version, release=release,
+ variant=variant, bugurl=bugurl, isfinal=isfinal)
+ logger.debug("product data: %s", self.product)
# NOTE: if you change isolabel, you need to change pungi to match, or
# the pungi images won't boot.
- isolabel = volid or "%s-%s-%s" % (product, version, self.arch.basearch)
+ isolabel = volid or "%s-%s-%s" % (self.product.name, self.product.version, self.arch.basearch)
if len(isolabel) > 32:
logger.fatal("the volume id cannot be longer than 32 characters")
--
To view this commit on github, visit https://github.com/rhinstaller/lorax/commit/7cd329a0652f2560efcdf36c4bd7f035cdc05570
More information about the anaconda-patches
mailing list