particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use stringToVersion from pykickstart.

Browse source 
First off, it's in the version module, not in the parser.  Second, it's
not necessary since makeVersion will take either a string or a constant
as an argument.

Patch by Chris Lumens <clumens@redhat.com>

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2015-12-10 15:01:40 -06:00 • committed by Mike McLean
parent ffcf1a30eb
commit b968701b85
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
builder/kojid
View file

@ -2446,7 +2446,7 @@ class ImageTask(BaseTaskHandler):
# may not be a problem if the included kickstarts are present
# in the repository we checked out.
if opts.get('ksversion'):
version = ksparser.version.makeVersion(ksparser.stringToVersion(opts['ksversion']))
version = ksparser.version.makeVersion(opts['ksversion'])
else:
version = ksparser.version.makeVersion()
self.ks = ksparser.KickstartParser(version)
@ -2827,8 +2827,7 @@ class OzImageTask(BaseTaskHandler):
# macros, Oz will fail because it can only handle flat files.
# We require users to flatten their kickstart file.
if self.opts.get('ksversion'):
version = ksparser.version.makeVersion(
ksparser.stringToVersion(self.opts['ksversion']))
version = ksparser.version.makeVersion(self.opts['ksversion'])
else:
version = ksparser.version.makeVersion()
ks = ksparser.KickstartParser(version)