- Fix location of media.repo file.

This commit is contained in:
Jesse Keating 2007-09-25 21:26:59 -04:00 committed by Jesse Keating
parent c4b27ff703
commit 835188ac2c
5 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,6 @@
* Tue Sep 25 2007 Jesse Keating <jkeating@redhat.com>
- Fix location of media.repo file.
* Tue Sep 18 2007 Jesse Keating <jkeating@redhat.com> * Tue Sep 18 2007 Jesse Keating <jkeating@redhat.com>
- Drop a .repo file on the root of the media. Used after install. - Drop a .repo file on the root of the media. Used after install.

2
pungi
View File

@ -115,7 +115,7 @@ if __name__ == '__main__':
today = time.strftime('%Y%m%d', time.localtime()) today = time.strftime('%Y%m%d', time.localtime())
def get_arguments(config): 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): def set_config(option, opt_str, value, parser, config):
config.set('default', option.dest, value) config.set('default', option.dest, value)

View File

@ -1,7 +1,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: pungi Name: pungi
Version: 1.1.1 Version: 1.1.2
Release: 1%{?dist} Release: 1%{?dist}
Summary: Distribution compose tool Summary: Distribution compose tool
@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Sep 25 2007 Jesse Keating <jkeating@redhat.com> - 1.1.2-1
- Fix location of media.repo file.
* Tue Sep 18 2007 Jesse Keating <jkeating@redhat.com> - 1.1.1-1 * Tue Sep 18 2007 Jesse Keating <jkeating@redhat.com> - 1.1.1-1
- Create a media.repo file on the first iso - Create a media.repo file on the first iso

View File

@ -335,7 +335,7 @@ class Pungi(pypungi.PungiBase):
# Write out a repo file for the disc to be used on the installed system # Write out a repo file for the disc to be used on the installed system
self.logger.info('Creating media repo file.') 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] repocontent = """[InstallMedia]
name=%s %s name=%s %s
mediaid=%s mediaid=%s

View File

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