From aa358c15177650addd547369b409d82d719f19ea Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 14 Mar 2008 16:55:28 -0400 Subject: [PATCH] Fix srpm stuff --- Changelog | 1 + pungi.spec | 2 +- src/pypungi/pungi.py | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 7687ed1f..44f564f1 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ * Fri Mar 14 2008 Jesse Keating - Don't pass --prodpath to buildinstall. It won't like it. +- Fix source iso making * Wed Mar 12 2008 Jesse Keating - Lower the CD size to 650; need to investigate pkgordering soon diff --git a/pungi.spec b/pungi.spec index 69c876ca..07376345 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,7 +2,7 @@ Name: pungi Version: 1.2.11 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Distribution compose tool Group: Development/Tools diff --git a/src/pypungi/pungi.py b/src/pypungi/pungi.py index 431f71fe..2d169873 100755 --- a/src/pypungi/pungi.py +++ b/src/pypungi/pungi.py @@ -295,7 +295,7 @@ class Pungi(pypungi.PungiBase): # this is stolen from splittree.py in anaconda-runtime. Blame them if its ugly (: for i in range(timber.src_list[0], timber.src_list[-1] + 1): - pypungi._ensuredir('%s-disc%d/SRPMS' % (timper.dist_dir, i), + pypungi._ensuredir('%s-disc%d/SRPMS' % (timber.dist_dir, i), self.logger, force=self.config.getboolean('default', 'force'), clean=True) @@ -472,8 +472,9 @@ cost=500 'repodata-%s' % self.config.get('default', 'arch')), os.path.join(self.topdir, 'repodata')) # Move the unified disk out - shutil.rmtree(os.path.join(self.workdir, 'os-unified'), ignore_errors=True) - shutil.move('%s-disc1' % self.topdir, os.path.join(self.workdir, 'os-unified')) + if not self.config.get('default', 'arch') == 'source': + shutil.rmtree(os.path.join(self.workdir, 'os-unified'), ignore_errors=True) + shutil.move('%s-disc1' % self.topdir, os.path.join(self.workdir, 'os-unified')) # Write out a line describing the media self.writeinfo('media: %s' % isofile)