Fix bug with product DataHolder overwriting product string.
This commit is contained in:
parent
e27ebffe81
commit
7cd329a065
@ -237,14 +237,13 @@ class Lorax(BaseLoraxClass):
|
|||||||
logger.debug("self.arch.%s = %s", attr, getattr(self.arch,attr))
|
logger.debug("self.arch.%s = %s", attr, getattr(self.arch,attr))
|
||||||
|
|
||||||
logger.info("setting up build parameters")
|
logger.info("setting up build parameters")
|
||||||
product = DataHolder(name=product, version=version, release=release,
|
self.product = DataHolder(name=product, version=version, release=release,
|
||||||
variant=variant, bugurl=bugurl, isfinal=isfinal)
|
variant=variant, bugurl=bugurl, isfinal=isfinal)
|
||||||
self.product = product
|
logger.debug("product data: %s", self.product)
|
||||||
logger.debug("product data: %s", product)
|
|
||||||
|
|
||||||
# NOTE: if you change isolabel, you need to change pungi to match, or
|
# NOTE: if you change isolabel, you need to change pungi to match, or
|
||||||
# the pungi images won't boot.
|
# 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:
|
if len(isolabel) > 32:
|
||||||
logger.fatal("the volume id cannot be longer than 32 characters")
|
logger.fatal("the volume id cannot be longer than 32 characters")
|
||||||
|
Loading…
Reference in New Issue
Block a user