More chnages for netinst.iso/boot.iso

Changelog

@@ -1,3 +1,7 @@
+* Tue Mar 11 2008 Jesse Keating <jkeating@redhat.com>
+- netinst.iso was renamed to boot.iso.  We want to link it
+  to the iso dir, but keep the netinst.iso name for now.
+
 * Wed Mar 05 2008 Jesse Keating <jkeating@redhat.com>
 - Fix ppc split iso generation
 - Exclude repoview from isos

pungi.spec

@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        1.2.9
+Version:        1.2.10
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 11 2008 Jesse Keating <jkeating@redhat.com> - 1.2.10-1
+- Handle netinst.iso being renamed to boot.iso
+
 * Wed Mar 05 2008 Jesse Keating <jkeating@redhat.com> - 1.2.9-1
 - Fix ppc split iso generation
 - Exclude repoview from isos

setup.py

@@ -2,7 +2,7 @@ from distutils.core import setup
 import glob
 
 setup(name='pungi',
-      version='1.2.9',
+      version='1.2.10',
       description='Distribution compose tool',
       author='Jesse Keating',
       author_email='jkeating@redhat.com',

src/bin/pungi.py

@@ -121,7 +121,7 @@ if __name__ == '__main__':
     today = time.strftime('%Y%m%d', time.localtime())
 
     def get_arguments(config):
-        parser = OptionParser(version="%prog 1.2.9")
+        parser = OptionParser(version="%prog 1.2.10")
 
         def set_config(option, opt_str, value, parser, config):
             config.set('default', option.dest, value)

src/pypungi/pungi.py

@@ -533,15 +533,15 @@ cost=500
             # Write out a line describing the CD set
             self.writeinfo('mediaset: %s' % ' '.join(isolist))
 
-        # Now copy the netinst iso
+        # Now link the boot iso
         if not self.config.get('default', 'arch') == 'source' and \
-        os.path.exists(os.path.join(self.topdir, 'images', 'netinst.iso')):
+        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)
 
-            # copy the netinst iso to the iso dir
-            shutil.copy2(os.path.join(self.topdir, 'images', 'netinst.iso'), isofile)
+            # link the boot iso to the iso dir
+            pypungi._link(os.path.join(self.topdir, 'images', 'boot.iso'), isofile)
 
             # shove the sha1sum into a file
             sha1file = open(os.path.join(self.isodir, 'SHA1SUM'), 'a')