Fix srpm stuff

This commit is contained in:
Jesse Keating 2008-03-14 16:55:28 -04:00 committed by Jesse Keating
parent bd4eea43d0
commit aa358c1517
3 changed files with 6 additions and 4 deletions

View File

@ -1,5 +1,6 @@
* Fri Mar 14 2008 Jesse Keating <jkeating@redhat.com>
- Don't pass --prodpath to buildinstall. It won't like it.
- Fix source iso making
* Wed Mar 12 2008 Jesse Keating <jkeating@redhat.com>
- Lower the CD size to 650; need to investigate pkgordering soon

View File

@ -2,7 +2,7 @@
Name: pungi
Version: 1.2.11
Release: 1%{?dist}
Release: 1%{?dist}.1
Summary: Distribution compose tool
Group: Development/Tools

View File

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