diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 6274c61e..8eb6c7fa 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -140,7 +140,7 @@ class Lorax(BaseLoraxClass): logger.addHandler(fh) def run(self, ybo, product, version, release, variant="", bugurl="", - is_beta=True, workdir=None, outputdir=None): + isfinal=False, workdir=None, outputdir=None): assert self._configured @@ -217,10 +217,10 @@ class Lorax(BaseLoraxClass): # set up optional build parameters self.variant = variant self.bugurl = bugurl - self.is_beta = is_beta + self.isfinal = isfinal logger.debug("set variant = {0.variant}".format(self)) logger.debug("set bugurl = {0.bugurl}".format(self)) - logger.debug("set is_beta = {0.is_beta}".format(self)) + logger.debug("set isfinal = {0.isfinal}".format(self)) # parse the template logger.info("parsing the template") @@ -258,7 +258,7 @@ class Lorax(BaseLoraxClass): # write .buildstamp buildstamp = BuildStamp(self.workdir, self.product, self.version, - self.bugurl, self.is_beta, self.buildarch) + self.bugurl, self.isfinal, self.buildarch) buildstamp.write() shutil.copy2(buildstamp.path, self.installtree.root) diff --git a/src/pylorax/buildstamp.py b/src/pylorax/buildstamp.py index 20b62130..97f0477b 100644 --- a/src/pylorax/buildstamp.py +++ b/src/pylorax/buildstamp.py @@ -28,13 +28,13 @@ from sysutils import joinpaths class BuildStamp(object): - def __init__(self, workdir, product, version, bugurl, is_beta, buildarch): + def __init__(self, workdir, product, version, bugurl, isfinal, buildarch): self.path = joinpaths(workdir, ".buildstamp") self.product = product self.version = version self.bugurl = bugurl - self.is_beta = is_beta + self.isfinal = isfinal now = datetime.datetime.now() now = now.strftime("%Y%m%d%H%M") @@ -47,5 +47,5 @@ class BuildStamp(object): fobj.write("Product={0.product}\n".format(self)) fobj.write("Version={0.version}\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)) diff --git a/src/sbin/lorax b/src/sbin/lorax index 3096fa5d..a056f3e7 100755 --- a/src/sbin/lorax +++ b/src/sbin/lorax @@ -48,7 +48,7 @@ def main(args): required.add_option("-r", "--release", help="release information", metavar="STRING") required.add_option("-s", "--source", - help="source repository (may be listed multibple times)", + help="source repository (may be listed multiple times)", metavar="REPOSITORY", action="append", default=[]) # optional arguments @@ -61,8 +61,8 @@ def main(args): optional.add_option("-b", "--bugurl", help="bug reporting URL for the product", metavar="URL", default="your distribution provided bug reporting tool") - optional.add_option("--isbeta", help="", - action="store_true", default=False, dest="is_beta") + optional.add_option("--isfinal", help="", + action="store_true", default=False) # add the option groups to the parser parser.add_option_group(required) @@ -110,7 +110,7 @@ def main(args): lorax = pylorax.Lorax() lorax.configure() lorax.run(yb, opts.product, opts.version, opts.release, - opts.variant, opts.bugurl, opts.is_beta, + opts.variant, opts.bugurl, opts.isfinal, workdir=tempdir, outputdir=outputdir)