[createrepo/f16] update to latest head to add a fix for mash and add pyliblzma requirement

Seth Vidal skvidal at fedoraproject.org
Wed Oct 26 18:00:01 UTC 2011


commit d704c0442683249eece000571b61eca3753999e7
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Oct 26 13:59:59 2011 -0400

    update to latest head to add a fix for mash and add pyliblzma requirement

 createrepo-head.patch |    6 ++++--
 createrepo.spec       |    8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/createrepo-head.patch b/createrepo-head.patch
index e5a8ebc..f230f3a 100644
--- a/createrepo-head.patch
+++ b/createrepo-head.patch
@@ -944,7 +944,7 @@ index 27d3690..54863cb 100644
 +        print po.xml_dump_other_metadata()
 +
 diff --git a/createrepo/utils.py b/createrepo/utils.py
-index 995c3b9..c816640 100644
+index 995c3b9..c5cec64 100644
 --- a/createrepo/utils.py
 +++ b/createrepo/utils.py
 @@ -23,6 +23,12 @@ import bz2
@@ -960,7 +960,7 @@ index 995c3b9..c816640 100644
  
  def errorprint(stuff):
      print >> sys.stderr, stuff
-@@ -69,6 +75,65 @@ def bzipFile(source, dest):
+@@ -69,6 +75,67 @@ def bzipFile(source, dest):
      s_fn.close()
  
  
@@ -1013,6 +1013,8 @@ index 995c3b9..c816640 100644
 +    if not compress_type:
 +        # we are readonly and we don't give a compress_type - then guess based on the file extension
 +        compress_type = fn.split('.')[-1]
++        if compress_type not in _available_compression:
++            compress_type = 'gz'
 +            
 +    if compress_type == 'xz':
 +        return lzma.LZMAFile(fn, mode)
diff --git a/createrepo.spec b/createrepo.spec
index cbd1a61..18c24e4 100644
--- a/createrepo.spec
+++ b/createrepo.spec
@@ -3,7 +3,7 @@
 Summary: Creates a common metadata repository
 Name: createrepo
 Version: 0.9.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -13,7 +13,7 @@ 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.4.3-4, python-deltarpm, deltarpm
+Requires: yum-metadata-parser, yum >= 3.4.3-4, python-deltarpm, deltarpm, pyliblzma
 BuildRequires: python
 
 %description
@@ -47,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/createrepo
 
 %changelog
+* Wed Oct 26 2011 Seth Vidal <skvidal at fedoraproject.org> - 0.9.9-8
+- change how compressOpen() defaults so mash doesn't break
+- add requires for pyliblzma
+
 * Mon Oct 24 2011 Seth Vidal <skvidal at fedoraproject.org> - 0.9.9-7
 - latest upstream
 - --compress-type among other deals.


More information about the scm-commits mailing list