From 835188ac2c0ee4e5ed0853f70501bada6f189609 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 25 Sep 2007 21:26:59 -0400 Subject: [PATCH] - Fix location of media.repo file. --- Changelog | 3 +++ pungi | 2 +- pungi.spec | 5 ++++- pypungi/pungi.py | 2 +- setup.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 43ef0916..0f97c9fe 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +* Tue Sep 25 2007 Jesse Keating +- Fix location of media.repo file. + * Tue Sep 18 2007 Jesse Keating - Drop a .repo file on the root of the media. Used after install. diff --git a/pungi b/pungi index 4d9e6194..f405d2f7 100755 --- a/pungi +++ b/pungi @@ -115,7 +115,7 @@ if __name__ == '__main__': today = time.strftime('%Y%m%d', time.localtime()) def get_arguments(config): - parser = OptionParser(version="%prog 1.1.1") + parser = OptionParser(version="%prog 1.1.2") def set_config(option, opt_str, value, parser, config): config.set('default', option.dest, value) diff --git a/pungi.spec b/pungi.spec index 8d3d1a15..e3552a6f 100644 --- a/pungi.spec +++ b/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.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: Distribution compose tool @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 25 2007 Jesse Keating - 1.1.2-1 +- Fix location of media.repo file. + * Tue Sep 18 2007 Jesse Keating - 1.1.1-1 - Create a media.repo file on the first iso diff --git a/pypungi/pungi.py b/pypungi/pungi.py index 135045f0..e35d0cf7 100755 --- a/pypungi/pungi.py +++ b/pypungi/pungi.py @@ -335,7 +335,7 @@ class Pungi(pypungi.PungiBase): # Write out a repo file for the disc to be used on the installed system self.logger.info('Creating media repo file.') - repofile = open(os.path.join('%s-disc1' % self.topdir, 'media.repo'), 'w') + repofile = open(os.path.join(self.topdir, 'media.repo'), 'w') repocontent = """[InstallMedia] name=%s %s mediaid=%s diff --git a/setup.py b/setup.py index 5901a340..710be998 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup import glob setup(name='pungi', - version='1.1.1', + version='1.1.2', description='Distribution compose tool', author='Jesse Keating', author_email='jkeating@redhat.com',