From d2c9c76a55eb5ffa20614852328880acab2bedc1 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 22 Mar 2007 17:48:41 -0400 Subject: [PATCH] Rescue fix from Prarit --- Changelog | 1 + pypungi/pungi.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index a62372a0..67828e20 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ * Thu Mar 22 2007 Jesse Keating - Pass flavor off to buildinstall if it is set (wwoods) +- Don't try a rescue if the script doesn't exist (prarit) * Fri Mar 16 2007 Jesse Keating - Fix a logic flaw in the depsolving loop diff --git a/pypungi/pungi.py b/pypungi/pungi.py index 2353324b..775da6c5 100755 --- a/pypungi/pungi.py +++ b/pypungi/pungi.py @@ -445,7 +445,8 @@ class Pungi: self.writeinfo('dvdset: %s' % ' '.join(isolist)) # Now make rescue images - if not self.config.get('default', 'arch') == 'source': + if not self.config.get('default', 'arch') == 'source' and + os.path.exists('/usr/lib/anaconda-runtime/mk-rescueimage.%s' % self.config.get('default', 'arch')): isoname = '%s-%s-%s-rescuecd.iso' % (self.config.get('default', 'iso_basename'), self.config.get('default', 'version'), self.config.get('default', 'arch')) isofile = os.path.join(self.isodir, isoname) @@ -482,7 +483,6 @@ class Pungi: # run the command self._doRunCommand(mkisofs + extraargs) - #log.info("Result from Rescue mkisofs: %s" % res) # shove the sha1sum into a file sha1file = open(os.path.join(self.isodir, 'SHA1SUM'), 'a')