almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Fix another problem with src repo generation, handle flavor.

Browse Source
This commit is contained in:
Jesse Keating 2008-04-16 23:04:25 -04:00
parent e7430529af
commit 24641ddfbe
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pungi.spec
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.2.15 Version: 1.2.16
Release: 1%{?dist} Release: 1%{?dist}
Summary: Distribution compose tool Summary: Distribution compose tool
@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Apr 16 2008 jkeating <jkeating@redhat.com> 1.2.16-1
- Fix another issue with source repo stuff.
* Wed Apr 16 2008 jkeating <jkeating@redhat.com> 1.2.15-1 * Wed Apr 16 2008 jkeating <jkeating@redhat.com> 1.2.15-1
- Disable comps cleanup until xslt is fixed - Disable comps cleanup until xslt is fixed
- Add support for yum repo costs - Add support for yum repo costs

2
setup.py
View File

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

2
src/bin/pungi.py
View File

@ -122,7 +122,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.2.15") parser = OptionParser(version="%prog 1.2.16")
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)

3
src/pypungi/pungi.py
View File

@ -388,7 +388,8 @@ cost=500
if not self.config.get('default', 'arch') == 'source': if not self.config.get('default', 'arch') == 'source':
treesize = int(subprocess.Popen(mkisofs + ['-print-size', '-quiet', self.topdir], stdout=subprocess.PIPE).communicate()[0]) treesize = int(subprocess.Popen(mkisofs + ['-print-size', '-quiet', self.topdir], stdout=subprocess.PIPE).communicate()[0])
else: else:
srcdir = os.path.join(self.config.get('default', 'destdir'), self.config.get('default', 'version'), 'source', 'SRPMS') srcdir = os.path.join(self.config.get('default', 'destdir'), self.config.get('default', 'version'),
self.config.get('default', 'flavor'), 'source', 'SRPMS')
treesize = int(subprocess.Popen(mkisofs + ['-print-size', '-quiet', srcdir], stdout=subprocess.PIPE).communicate()[0]) treesize = int(subprocess.Popen(mkisofs + ['-print-size', '-quiet', srcdir], stdout=subprocess.PIPE).communicate()[0])
# Size returned is 2KiB clusters or some such. This translates that to MiB. # Size returned is 2KiB clusters or some such. This translates that to MiB.