add commandline option --isfinal for ga releases. defaulting to a beta

for https://bugzilla.redhat.com/show_bug.cgi?id=703815
This commit is contained in:
Dennis Gilmore 2011-05-16 17:59:23 -05:00
parent 6e05f8162f
commit 80120d1e53
3 changed files with 13 additions and 1 deletions

View File

@ -79,6 +79,8 @@ def main():
config.set('pungi', 'debuginfo', "False") config.set('pungi', 'debuginfo', "False")
if opts.nogreedy: if opts.nogreedy:
config.set('pungi', 'alldeps', "False") config.set('pungi', 'alldeps', "False")
if opts.isfinal:
config.set('pungi', 'isfinal', "True")
# Actually do work. # Actually do work.
mypungi = pypungi.Pungi(config, ksparser) mypungi = pypungi.Pungi(config, ksparser)
@ -186,6 +188,8 @@ if __name__ == '__main__':
help='Create the source isos (other arch runs must be done)') help='Create the source isos (other arch runs must be done)')
parser.add_option("--force", default=False, action="store_true", parser.add_option("--force", default=False, action="store_true",
help='Force reuse of an existing destination directory (will overwrite files)') help='Force reuse of an existing destination directory (will overwrite files)')
parser.add_option("--isfinal", default=False, action="store_true",
help='Specify this is a GA tree, which causes betanag to be turned off during install')
parser.add_option("-c", "--config", dest="config", parser.add_option("-c", "--config", dest="config",
help='Path to kickstart config file') help='Path to kickstart config file')

View File

@ -831,6 +831,13 @@ class Pungi(pypungi.PungiBase):
variant = self.config.get('pungi', 'flavor') variant = self.config.get('pungi', 'flavor')
bugurl = self.config.get('pungi', 'bugurl') bugurl = self.config.get('pungi', 'bugurl')
isfinal = self.config.get('pungi', 'isfinal')
# I want to pass in if the release is a final/GA release or not but lorax takes in if its a beta or not
# so set isbeta to be the oposite of isfinal
if isfinal:
isbeta = "False"
else:
isbeta = "True"
workdir = self.workdir workdir = self.workdir
outputdir = self.topdir outputdir = self.topdir
@ -841,7 +848,7 @@ class Pungi(pypungi.PungiBase):
# FIXME get the actual is_beta value # FIXME get the actual is_beta value
lorax.run(self.ayum, product=product, version=version, release=release, lorax.run(self.ayum, product=product, version=version, release=release,
variant=variant, bugurl=bugurl, is_beta=True, variant=variant, bugurl=bugurl, is_beta=isbeta,
workdir=workdir, outputdir=outputdir) workdir=workdir, outputdir=outputdir)
# write out the tree data for snake # write out the tree data for snake

View File

@ -43,4 +43,5 @@ class Config(SafeConfigParser):
self.set('pungi', 'cdsize', '695.0') self.set('pungi', 'cdsize', '695.0')
self.set('pungi', 'debuginfo', "True") self.set('pungi', 'debuginfo', "True")
self.set('pungi', 'alldeps', "True") self.set('pungi', 'alldeps', "True")
self.set('pungi', 'isfinal', "False")