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

Change IsBeta to IsFinal

Browse Source
This commit is contained in:
Martin Gracik 2011-07-25 10:38:10 +02:00
parent 010bedbbb7
commit d0fc111ac4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pylorax/__init__.py
View File

@ -140,7 +140,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=True, workdir=None, outputdir=None): isfinal=False, workdir=None, outputdir=None):
assert self._configured assert self._configured
@ -217,10 +217,10 @@ class Lorax(BaseLoraxClass):
# set up optional build parameters # set up optional build parameters
self.variant = variant self.variant = variant
self.bugurl = bugurl self.bugurl = bugurl
self.is_beta = is_beta self.isfinal = isfinal
logger.debug("set variant = {0.variant}".format(self)) logger.debug("set variant = {0.variant}".format(self))
logger.debug("set bugurl = {0.bugurl}".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 # parse the template
logger.info("parsing the template") logger.info("parsing the template")
@ -258,7 +258,7 @@ class Lorax(BaseLoraxClass):
# write .buildstamp # write .buildstamp
buildstamp = BuildStamp(self.workdir, self.product, self.version, buildstamp = BuildStamp(self.workdir, self.product, self.version,
self.bugurl, self.is_beta, self.buildarch) self.bugurl, self.isfinal, self.buildarch)
buildstamp.write() buildstamp.write()
shutil.copy2(buildstamp.path, self.installtree.root) shutil.copy2(buildstamp.path, self.installtree.root)

6
src/pylorax/buildstamp.py
View File

@ -28,13 +28,13 @@ from sysutils import joinpaths
class BuildStamp(object): 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.path = joinpaths(workdir, ".buildstamp")
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")
@ -47,5 +47,5 @@ class BuildStamp(object):
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))

8
src/sbin/lorax
View File

@ -48,7 +48,7 @@ def main(args):
required.add_option("-r", "--release", help="release information", required.add_option("-r", "--release", help="release information",
metavar="STRING") metavar="STRING")
required.add_option("-s", "--source", 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=[]) metavar="REPOSITORY", action="append", default=[])
# optional arguments # optional arguments
@ -61,8 +61,8 @@ def main(args):
optional.add_option("-b", "--bugurl", optional.add_option("-b", "--bugurl",
help="bug reporting URL for the product", metavar="URL", help="bug reporting URL for the product", metavar="URL",
default="your distribution provided bug reporting tool") default="your distribution provided bug reporting tool")
optional.add_option("--isbeta", help="", optional.add_option("--isfinal", help="",
action="store_true", default=False, dest="is_beta") action="store_true", default=False)
# add the option groups to the parser # add the option groups to the parser
parser.add_option_group(required) parser.add_option_group(required)
@ -110,7 +110,7 @@ def main(args):
lorax = pylorax.Lorax() lorax = pylorax.Lorax()
lorax.configure() lorax.configure()
lorax.run(yb, opts.product, opts.version, opts.release, 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) workdir=tempdir, outputdir=outputdir)