From 8812d10e439424d83b4e837e91c5f88c15379355 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 30 Apr 2011 09:52:11 +0200 Subject: import createrepo from rawhide --- Makefile | 4 + createrepo-head.patch | 35 ++++++ createrepo.spec | 299 ++++++++++++++++++++++++++++++++++++++++++++++ ten-changelog-limit.patch | 11 ++ 4 files changed, 349 insertions(+) create mode 100644 Makefile create mode 100644 createrepo-head.patch create mode 100644 createrepo.spec create mode 100644 ten-changelog-limit.patch diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1e65467 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../common/Makefile + diff --git a/createrepo-head.patch b/createrepo-head.patch new file mode 100644 index 0000000..4673323 --- /dev/null +++ b/createrepo-head.patch @@ -0,0 +1,35 @@ +diff --git a/createrepo/__init__.py b/createrepo/__init__.py +index 8f2538e..07abc27 100644 +--- a/createrepo/__init__.py ++++ b/createrepo/__init__.py +@@ -660,7 +660,12 @@ class MetaDataGenerator: + if line: + self.callback.errorlog('Worker %s: %s' % (num, line.rstrip())) + +- ++ for (num, job) in worker_jobs.items(): ++ if job.returncode != 0: ++ msg = "Worker exited with non-zero value: %s. Fatal." % job.returncode ++ self.callback.errorlog(msg) ++ raise MDError, msg ++ + if not self.conf.quiet: + self.callback.log("Workers Finished") + # finished with workers +diff --git a/worker.py b/worker.py +index eb35ef7..591a922 100755 +--- a/worker.py ++++ b/worker.py +@@ -83,8 +83,10 @@ def main(args): + external_data=external_data) + pri.write(pkg.xml_dump_primary_metadata()) + fl.write(pkg.xml_dump_filelists_metadata()) +- other.write(pkg.xml_dump_other_metadata(clog_limit= +- globalopts.get('clog_limit', None))) ++ clog_limit=globalopts.get('clog_limit', None) ++ if clog_limit is not None: ++ clog_limit = int(clog_limit) ++ other.write(pkg.xml_dump_other_metadata(clog_limit=clog_limit)) + except yum.Errors.YumBaseError, e: + print >> sys.stderr, "Error: %s" % e + continue diff --git a/createrepo.spec b/createrepo.spec new file mode 100644 index 0000000..42432ed --- /dev/null +++ b/createrepo.spec @@ -0,0 +1,299 @@ +%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +Summary: Creates a common metadata repository +Name: createrepo +Version: 0.9.9 +Release: 3%{?dist} +License: GPLv2 +Group: System Environment/Base +Source: %{name}-%{version}.tar.gz +Patch0: ten-changelog-limit.patch +Patch1: createrepo-head.patch +URL: http://createrepo.baseurl.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArchitectures: noarch +Requires: python >= 2.1, rpm-python, rpm >= 4.1.1, libxml2-python +Requires: yum-metadata-parser, yum >= 3.2.29-1, python-deltarpm, deltarpm +BuildRequires: python + +%description +This utility will generate a common metadata repository from a directory of rpm +packages. + +%prep +%setup -q +%patch0 -p0 +%patch1 -p1 + +%build + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT sysconfdir=%{_sysconfdir} install + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-, root, root,-) +%doc ChangeLog README COPYING COPYING.lib +%{_sysconfdir}/bash_completion.d/ +%{_datadir}/%{name}/ +%{_bindir}/createrepo +%{_bindir}/modifyrepo +%{_bindir}/mergerepo +%{_mandir}/*/* +%{python_sitelib}/createrepo + +%changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.9.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jan 27 2011 Seth Vidal - 0.9.9-2 +- make sure when a worker exits with a non-zero returncode we exit, too. + +* Wed Jan 26 2011 Seth Vidal - 0.9.9-1 +- 0.9.9 +- change yum requires to 3.2.29 + +* Wed Jul 21 2010 David Malcolm - 0.9.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Thu Jan 7 2010 Seth Vidal - 0.9.8-4 +- latest head with fixes for --update w/o --skipstat + + +* Tue Dec 22 2009 Seth Vidal - 0.9.8-3 +- patch to latest HEAD from upstream + +* Thu Sep 3 2009 Seth Vidal - 0.9.8-2 +- add drpm patch from https://bugzilla.redhat.com/show_bug.cgi?id=518658 + + +* Fri Aug 28 2009 Seth Vidal - 0.9.8-1 +- bump yum requires version +- remove head patch +- bump to 0.9.8 upstream + +* Tue Aug 18 2009 Seth Vidal - 0.9.7-15 +- update HEAD patch to include fix from mbonnet for typo'd PRAGMA in the filelists setup + +* Tue Aug 4 2009 Seth Vidal - 0.9.7-14 +- minor fix for rh bug 512610 + +* Fri Jul 24 2009 Fedora Release Engineering - 0.9.7-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jun 17 2009 Seth Vidal - 0.9.7-11 +- more profile output for deltarpms + +* Tue Jun 16 2009 Seth Vidal - 0.9.7-8 +- more patches from head +- speed up generating prestodelta, massively + +* Tue May 5 2009 Seth Vidal +- more head fixes - theoretically solving ALL of the sha1/sha silliness + +* Wed Apr 15 2009 Seth Vidal - 0.9.7-2 +- fix 495845 and other presto issues + +* Tue Mar 24 2009 Seth Vidal - 0.9.7-1 +- 0.9.7 +- require yum 3.2.22 + +* Tue Feb 24 2009 Fedora Release Engineering - 0.9.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Feb 10 2009 Seth Vidal - 0.9.6-11 +- change the order of deltarpms + +* Wed Feb 4 2009 Seth Vidal - 0.9.6-10 +- working mergerepo again + +* Tue Feb 3 2009 Seth Vidal - 0.9.6-9 +- fix normal createrepo'ing w/o the presto patches :( + +* Mon Feb 2 2009 Seth Vidal - 0.9.6-7 +- add deltarpm requirement for making presto metadata + +* Tue Jan 27 2009 Seth Vidal - 0.9.6-6 +- one more patch set to make sure modifyrepo works with sha256's, too + +* Mon Jan 26 2009 Seth Vidal - 0.9.6-5 +- add patch from upstream head for sha256 support + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.9.6-4 +- Rebuild for Python 2.6 + +* Tue Oct 28 2008 Seth Vidal - 0.9.6-1 +- 0.9.6-1 +- add mergerepo + +* Thu Oct 9 2008 James Antill - 0.9.5-5 +- Do atomic updates to the cachedir, for parallel runs +- Fix the patch + +* Fri Feb 22 2008 Seth Vidal - 0.9.5-2 +- patch for the mistake in the raise for an empty pkgid + +* Tue Feb 19 2008 Seth Vidal - 0.9.5-1 +- 0.9.5 +- ten-changelog-limit patch by default in fedora + +* Thu Jan 31 2008 Seth Vidal - 0.9.4-3 +- skip if no old metadata and --update was called. + +* Wed Jan 30 2008 Seth Vidal - 0.9.4-1 +- 0.9.4 + +* Tue Jan 22 2008 Seth Vidal - 0.9.3 +- 0.9.3 + +* Thu Jan 17 2008 Seth Vidal - 0.9.2-1 +- remove all other patches - 0.9.2 + +* Tue Jan 15 2008 Seth Vidal 0.9.1-3 +- more patches - almost 0.9.2 but not quite + +* Thu Jan 10 2008 Seth Vidal 0.9.1-2 +- patch to fix bug until 0.9.2 + +* Wed Jan 9 2008 Seth Vidal 0.9.1-1 +- 0.9.1 + +* Mon Jan 7 2008 Seth Vidal 0.9-1 +- 0.9 +- add yum dep + + +* Mon Nov 26 2007 Luke Macken - 0.4.11-1 +- Update to 0.4.11 +- Include COPYING file and change License to GPLv2 + +* Thu Jun 07 2007 Paul Nasrat - 0.4.10-1 +- Update to 0.4.10 + +* Wed May 16 2007 Paul Nasrat - 0.4.9-1 +- Update to 0.4.9 + +* Tue May 15 2007 Jeremy Katz - 0.4.8-4 +- fix the last patch + +* Tue May 15 2007 Jeremy Katz - 0.4.8-3 +- use dbversion given by yum-metadata-parser instead of hardcoded + value (#239938) + +* Wed Mar 14 2007 Paul Nasrat - 0.4.8-2 +- Remove requires (#227680) + +* Wed Feb 21 2007 Jeremy Katz - 0.4.8-1 +- update to 0.4.8 + +* Mon Feb 12 2007 Jesse Keating - 0.4.7-3 +- Require yum-metadata-parser. + +* Thu Feb 8 2007 Jeremy Katz - 0.4.7-2 +- add modifyrepo to the file list + +* Thu Feb 8 2007 Jeremy Katz - 0.4.7-1 +- update to 0.4.7 + +* Mon Feb 05 2007 Paul Nasrat - 0.4.6-2 +- Packaging guidelines (#225661) + +* Thu Nov 09 2006 Paul Nasrat - 0.4.6-1 +- Upgrade to latest release +- Fix requires (#214388) + +* Wed Jul 19 2006 Paul Nasrat - 0.4.4-2 +- Fixup relative paths (#199228) + +* Wed Jul 12 2006 Jesse Keating - 0.4.4-1.1 +- rebuild + +* Mon Apr 17 2006 Paul Nasrat - 0.4.4-1 +- Update to latest upstream + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Nov 18 2005 Paul Nasrat - 0.4.3-5 +- Fix split with normalised directories + +* Fri Nov 18 2005 Paul Nasrat - 0.4.3-4 +- Another typo fix +- Normalise directories + +* Thu Nov 17 2005 Paul Nasrat - 0.4.3-3.1 +- really fix them + +* Thu Nov 17 2005 Paul Nasrat - 0.4.3-3 +- Fix regressions for absolute/relative paths + +* Sun Nov 13 2005 Paul Nasrat - 0.4.3-2 +- Sync upto HEAD +- Split media support + +* Thu Jul 14 2005 Paul Nasrat - 0.4.3-1 +- New upstream version 0.4.3 (cachedir support) + +* Tue Jan 18 2005 Jeremy Katz - 0.4.2-2 +- add the manpage + +* Tue Jan 18 2005 Jeremy Katz - 0.4.2-1 +- 0.4.2 + +* Thu Oct 21 2004 Paul Nasrat +- 0.4.1, fixes #136613 +- matched ghosts not being added into primary.xml files + +* Mon Oct 18 2004 Bill Nottingham +- 0.4.0, fixes #134776 + +* Thu Sep 30 2004 Paul Nasrat +- Rebuild new upstream release - 0.3.9 + +* Thu Sep 30 2004 Seth Vidal +- 0.3.9 +- fix for groups checksum creation + +* Sat Sep 11 2004 Seth Vidal +- 0.3.8 + +* Wed Sep 1 2004 Seth Vidal +- 0.3.7 + +* Fri Jul 23 2004 Seth Vidal +- make filelists right + + +* Fri Jul 23 2004 Seth Vidal +- fix for broken filelists + +* Mon Jul 19 2004 Seth Vidal +- re-enable groups +- update num to 0.3.4 + +* Tue Jun 8 2004 Seth Vidal +- update to the format +- versioned deps +- package counts +- uncompressed checksum in repomd.xml + + +* Fri Apr 16 2004 Seth Vidal +- 0.3.2 - small addition of -p flag + +* Sun Jan 18 2004 Seth Vidal +- I'm an idiot + +* Sun Jan 18 2004 Seth Vidal +- 0.3 + +* Tue Jan 13 2004 Seth Vidal +- 0.2 - + +* Sat Jan 10 2004 Seth Vidal +- first packaging + diff --git a/ten-changelog-limit.patch b/ten-changelog-limit.patch new file mode 100644 index 0000000..07b6106 --- /dev/null +++ b/ten-changelog-limit.patch @@ -0,0 +1,11 @@ +--- createrepo/__init__.py~ 2011-01-26 12:14:30.000000000 -0500 ++++ createrepo/__init__.py 2011-01-26 12:34:17.291441719 -0500 +@@ -96,7 +96,7 @@ + self.mdtimestamp = 0 + self.directory = None + self.directories = [] +- self.changelog_limit = None # needs to be an int or None ++ self.changelog_limit = 10 # needs to be an int or None + self.unique_md_filenames = True + self.additional_metadata = {} # dict of 'type':'filename' + self.revision = str(int(time.time())) -- cgit