Attachment 315923 Details for Bug 461229 – patch to correct the issue

[patch] patch to correct the issue

diet.patch (text/plain), 2.29 KB, created by Jerry Vonau on 2008-09-05 18:02:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jerry Vonau

Created: 2008-09-05 18:02:04 UTC

Size: 2.29 KB

patch

obsolete

>--- /usr/lib/python2.5/site-packages/pypungi/pungi.py.orig	2008-09-05 11:21:53.000000000 -0500
>+++ /usr/lib/python2.5/site-packages/pypungi/pungi.py	2008-09-05 12:53:37.000000000 -0500
>@@ -383,6 +383,21 @@
> 
>         sparcbootargs = ['-G', '/boot/isofs.b', '-B', '...', '-s', '/boot/silo.conf', '-sparc-label', '"sparc"']
> 
>+        # Now move the boot iso
>+        if not self.config.get('default', 'arch') == 'source' and \
>+        os.path.exists(os.path.join(self.topdir, 'images', 'boot.iso')):
>+            isoname = '%s-%s-%s-netinst.iso' % (self.config.get('default', 'iso_basename'),
>+                self.config.get('default', 'version'), self.config.get('default', 'arch'))
>+            isofile = os.path.join(self.isodir, isoname)
>+
>+            shutil.move(os.path.join(self.topdir, 'images', 'boot.iso'), os.path.join(self.workdir, isofile))
>+
>+            # shove the sha1sum into a file
>+            sha1file = open(os.path.join(self.isodir, 'SHA1SUM'), 'a')
>+            pypungi._doRunCommand(['/usr/bin/sha1sum', isoname], self.logger, rundir=self.isodir, output=sha1file)
>+            sha1file.close()
>+
>+
>         # Check the size of the tree
>         # This size checking method may be bunk, accepting patches...
>         if not self.config.get('default', 'arch') == 'source':
>@@ -534,20 +549,6 @@
>             # Write out a line describing the CD set
>             self.writeinfo('mediaset: %s' % ' '.join(isolist))
> 
>-        # Now link the boot iso
>-        if not self.config.get('default', 'arch') == 'source' and \
>-        os.path.exists(os.path.join(self.topdir, 'images', 'boot.iso')):
>-            isoname = '%s-%s-%s-netinst.iso' % (self.config.get('default', 'iso_basename'),
>-                self.config.get('default', 'version'), self.config.get('default', 'arch'))
>-            isofile = os.path.join(self.isodir, isoname)
>-
>-            # link the boot iso to the iso dir
>-            pypungi._link(os.path.join(self.topdir, 'images', 'boot.iso'), isofile, self.logger)
>-
>-            # shove the sha1sum into a file
>-            sha1file = open(os.path.join(self.isodir, 'SHA1SUM'), 'a')
>-            pypungi._doRunCommand(['/usr/bin/sha1sum', isoname], self.logger, rundir=self.isodir, output=sha1file)
>-            sha1file.close()
> 
>         # Do some clean up
>         dirs = os.listdir(self.archdir)

Actions: View | Diff

Attachments on bug 461229: 315923