revisor/pungi.py | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit c68c91e44cca61236927c338b31ed0d285a0e9b9
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeu...@ergo-project.org>
Date: Fri Jan 28 15:24:01 2011 -0700
Fix up buildinstall call
diff --git a/revisor/pungi.py b/revisor/pungi.py
index a6340b0..3b778de 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -274,7 +274,7 @@ cost=500
#buildinstall.append('TMPDIR=%s' % self.workdir) # TMPDIR broken in
buildinstall
# FIXME: Determine options from the anaconda-runtime version
- if self.cfg.version_from in [ "F9", "F10", "F11", "F12", "F13",
"DEVEL" ]:
+ if self.cfg.version_from in [ "F9", "F10", "F11", "F12", "F13", "F14",
"DEVEL" ]:
buildinstall.append('--debug')
if self.cfg.version_from in [ "RHEL5" ]:
@@ -295,7 +295,7 @@ cost=500
buildinstall.append('"%s %s"' % (self.cfg.product_name,
self.cfg.version))
# FIXME: Everything < F9 needs --prodpath
- if not self.cfg.version_from in [ "F9", "F10", "F11", "F12", "F13",
"DEVEL" ]:
+ if not self.cfg.version_from in [ "F9", "F10", "F11", "F12", "F13",
"F14", "DEVEL" ]:
buildinstall.append('--prodpath')
buildinstall.append(self.cfg.product_path)
@@ -606,14 +606,16 @@ cost=500
def create_rescue_disk(self, callback=None):
# Now make rescue images
- if not self.cfg.architecture == 'source' and \
- os.path.exists('/usr/lib/anaconda-runtime/mk-rescueimage.%s' %
self.cfg.architecture):
+ if not self.cfg.architecture == 'source':
+ if os.path.exists('/usr/lib/anaconda-runtime/mk-rescueimage.%s' %
self.cfg.architecture):
+ mk_rescueimage =
os.path.exists('/usr/lib/anaconda-runtime/mk-rescueimage.%s' %
self.cfg.architecture)
+
isoname = '%s-%s-%s-rescuecd.iso' % (self.cfg.iso_basename,
self.cfg.version, self.cfg.architecture)
isofile =
os.path.join(self.cfg.destination_directory,"iso",isoname)
# make the rescue tree
- rescue = ['/usr/lib/anaconda-runtime/mk-rescueimage.%s' %
self.cfg.architecture]
+ rescue = [mk_rescueimage]
rescue.append(self.topdir)
rescue.append(self.workdir)
rescue.append(self.cfg.iso_basename)
@@ -645,9 +647,14 @@ cost=500
# run the command
self.base.run_command(self.cfg.cmd_mkisofs + extraargs,
callback=callback)
+ if os.path.exists('/usr/bin/implantisomd5'):
+ implant_md5 = "/usr/bin/implantisomd5"
+ else:
+ impland_md5 = '/usr/lib/anaconda-runtime/implantisomd5'
+
# implant md5 for mediacheck on all but source arches
if not self.cfg.architecture == 'source':
-
self.base.run_command(['/usr/lib/anaconda-runtime/implantisomd5', isofile])
+ self.base.run_command([impland_md5, isofile])
# shove the sha1sum into a file
if
os.access(os.path.join(self.cfg.destination_directory,"iso","SHA1SUM"),
os.R_OK):
_______________________________________________
revisor-devel mailing list
revisor-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/revisor-devel
