From 80120d1e5355adc6a7c66213ef31e19b51a80cf6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 16 May 2011 17:59:23 -0500 Subject: [PATCH] add commandline option --isfinal for ga releases. defaulting to a beta for https://bugzilla.redhat.com/show_bug.cgi?id=703815 --- src/bin/pungi.py | 4 ++++ src/pypungi/__init__.py | 9 ++++++++- src/pypungi/config.py | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/bin/pungi.py b/src/bin/pungi.py index cf5bc0cc..1ec8a1e0 100755 --- a/src/bin/pungi.py +++ b/src/bin/pungi.py @@ -79,6 +79,8 @@ def main(): config.set('pungi', 'debuginfo', "False") if opts.nogreedy: config.set('pungi', 'alldeps', "False") + if opts.isfinal: + config.set('pungi', 'isfinal', "True") # Actually do work. mypungi = pypungi.Pungi(config, ksparser) @@ -186,6 +188,8 @@ if __name__ == '__main__': help='Create the source isos (other arch runs must be done)') parser.add_option("--force", default=False, action="store_true", 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", help='Path to kickstart config file') diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py index db443b37..7cc72911 100644 --- a/src/pypungi/__init__.py +++ b/src/pypungi/__init__.py @@ -831,6 +831,13 @@ class Pungi(pypungi.PungiBase): variant = self.config.get('pungi', 'flavor') 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 outputdir = self.topdir @@ -841,7 +848,7 @@ class Pungi(pypungi.PungiBase): # FIXME get the actual is_beta value 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) # write out the tree data for snake diff --git a/src/pypungi/config.py b/src/pypungi/config.py index c8eb10de..dd41ffcb 100644 --- a/src/pypungi/config.py +++ b/src/pypungi/config.py @@ -43,4 +43,5 @@ class Config(SafeConfigParser): self.set('pungi', 'cdsize', '695.0') self.set('pungi', 'debuginfo', "True") self.set('pungi', 'alldeps', "True") + self.set('pungi', 'isfinal', "False")