almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix is_beta -> isfinal and add [Compose] to .buildstamp

Browse Source
This commit is contained in:
Will Woods 2011-09-21 14:34:27 -04:00
parent efea74ad12
commit b7269da23a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pylorax/__init__.py
View File

@ -124,7 +124,7 @@ class Lorax(BaseLoraxClass):
logger.addHandler(fh) logger.addHandler(fh)
def run(self, ybo, product, version, release, variant="", bugurl="", def run(self, ybo, product, version, release, variant="", bugurl="",
is_beta=False, workdir=None, outputdir=None): isfinal=False, workdir=None, outputdir=None):
assert self._configured assert self._configured
@ -169,7 +169,7 @@ class Lorax(BaseLoraxClass):
logger.info("setting up build parameters") logger.info("setting up build parameters")
product = DataHolder(name=product, version=version, release=release, product = DataHolder(name=product, version=version, release=release,
variant=variant, bugurl=bugurl, is_beta=is_beta) variant=variant, bugurl=bugurl, isfinal=isfinal)
self.product = product self.product = product
logger.debug("product data: %s" % product) logger.debug("product data: %s" % product)
@ -184,7 +184,7 @@ class Lorax(BaseLoraxClass):
# write .buildstamp # write .buildstamp
buildstamp = BuildStamp(self.product.name, self.product.version, buildstamp = BuildStamp(self.product.name, self.product.version,
self.product.bugurl, self.product.is_beta, self.arch.buildarch) self.product.bugurl, self.product.isfinal, self.arch.buildarch)
buildstamp.write(joinpaths(self.inroot, ".buildstamp")) buildstamp.write(joinpaths(self.inroot, ".buildstamp"))

9
src/pylorax/buildstamp.py
View File

@ -27,22 +27,25 @@ import datetime
class BuildStamp(object): class BuildStamp(object):
def __init__(self, product, version, bugurl, is_beta, buildarch): def __init__(self, product, version, bugurl, isfinal, buildarch):
self.product = product self.product = product
self.version = version self.version = version
self.bugurl = bugurl self.bugurl = bugurl
self.is_beta = is_beta self.isfinal = isfinal
now = datetime.datetime.now() now = datetime.datetime.now()
now = now.strftime("%Y%m%d%H%M") now = now.strftime("%Y%m%d%H%M")
self.uuid = "{0}.{1}".format(now, buildarch) self.uuid = "{0}.{1}".format(now, buildarch)
def write(self, outfile): def write(self, outfile):
vernum = "treebuilder" # XXX TODO FIXME
logger.info("writing .buildstamp file") logger.info("writing .buildstamp file")
with open(outfile, "w") as fobj: with open(outfile, "w") as fobj:
fobj.write("[Main]\n") fobj.write("[Main]\n")
fobj.write("Product={0.product}\n".format(self)) fobj.write("Product={0.product}\n".format(self))
fobj.write("Version={0.version}\n".format(self)) fobj.write("Version={0.version}\n".format(self))
fobj.write("BugURL={0.bugurl}\n".format(self)) fobj.write("BugURL={0.bugurl}\n".format(self))
fobj.write("IsBeta={0.is_beta}\n".format(self)) fobj.write("IsFinal={0.isfinal}\n".format(self))
fobj.write("UUID={0.uuid}\n".format(self)) fobj.write("UUID={0.uuid}\n".format(self))
fobj.write("[Compose]\n")
fobj.write("Lorax={0}\n".format(vernum))