almalinux
/
pungi
15
1
Fork 0
Code Issues Pull Requests Releases Activity

Rescue fix from Prarit

This commit is contained in:
Jesse Keating 2007-03-22 17:48:41 -04:00 committed by Jesse Keating
parent ba6c7b1ae8
commit d2c9c76a55
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -1,5 +1,6 @@
* Thu Mar 22 2007 Jesse Keating <jkeating@redhat.com>
- 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 <jkeating@redhat.com>
- Fix a logic flaw in the depsolving loop

4
pypungi/pungi.py
View File

@ -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')