[createrepo] - upstream head patch - bump release

[Seth Vidal]

commit ded4647b9dbb3e97f8d0f75c042ff7478879bcc0
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Jul 20 17:08:53 2011 -0400

    - upstream head patch
    - bump release

 createrepo-head.patch |   20 ++++++++++++--------
 createrepo.spec       |    7 +++++--
 2 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/createrepo-head.patch b/createrepo-head.patch
index 552449a..5203f35 100644
--- a/createrepo-head.patch
+++ b/createrepo-head.patch
@@ -162,7 +162,7 @@ index 8f2538e..8549188 100644
                  self.conf.baseurl = self._getFragmentUrl(self.conf.baseurl, mediano)
                  self.writeMetadataDocs(filematrix[mydir], mydir)
 diff --git a/createrepo/readMetadata.py b/createrepo/readMetadata.py
-index 27d3690..a449e68 100644
+index 27d3690..88e5d95 100644
 --- a/createrepo/readMetadata.py
 +++ b/createrepo/readMetadata.py
 @@ -16,11 +16,25 @@
@@ -176,8 +176,8 @@ index 27d3690..a449e68 100644
 -from yum import repoMDObject
 +import yum
 +from yum import misc
-+
-+
++from yum.Errors import YumBaseError
++import tempfile
 +class CreaterepoPkgOld(yum.sqlitesack.YumAvailablePackageSqlite):
 +    # special for special people like us.
 +    def _return_remote_location(self):
@@ -193,7 +193,7 @@ index 27d3690..a449e68 100644
  
  
  class MetadataIndex(object):
-@@ -30,178 +44,70 @@ class MetadataIndex(object):
+@@ -30,178 +44,73 @@ class MetadataIndex(object):
              opts = {}
          self.opts = opts
          self.outputdir = outputdir
@@ -214,15 +214,19 @@ index 27d3690..a449e68 100644
 -        self.files = {'base' : basefile,
 -                      'filelist' : filelistfile,
 -                      'other' : otherfile}
+-        self.scan()
 +        self._repo = yum.yumRepo.YumRepository('garbageid')
 +        self._repo.baseurl = 'file://' + realpath
-+        self._repo.basecachedir = misc.getCacheDir()
++        self._repo.basecachedir = tempfile.mkdtemp(dir='/var/tmp', prefix="createrepo")
 +        self._repo.metadata_expire = 1
 +        self._repo.gpgcheck = 0
 +        self._repo.repo_gpgcheck = 0
 +        self._repo._sack = yum.sqlitesack.YumSqlitePackageSack(CreaterepoPkgOld)
 +        self.pkg_tups_by_path = {}
-         self.scan()
++        try:
++            self.scan()
++        except YumBaseError, e:
++            print "Could not find valid repo at: %s" % self.outputdir
 +        
  
      def scan(self):
@@ -362,12 +366,12 @@ index 27d3690..a449e68 100644
 +                    continue
 +
 +            self.pkg_tups_by_path[relpath] = thispo.pkgtup
-+
  
 -    def getNodes(self, relpath):
 -        """Return base, filelist, and other nodes for file, if they exist
  
 -        Returns a tuple of nodes, or None if not found
++
 +    def getNodes(self, relpath):
 +        """return a package object based on relative path of pkg
          """
@@ -423,7 +427,7 @@ index 27d3690..a449e68 100644
  
  if __name__ == "__main__":
      cwd = os.getcwd()
-@@ -209,9 +115,9 @@ if __name__ == "__main__":
+@@ -209,9 +118,9 @@ if __name__ == "__main__":
              'pkgdir': cwd}
  
      idx = MetadataIndex(cwd, opts)
diff --git a/createrepo.spec b/createrepo.spec
index 2ac9aed..3b10489 100644
--- a/createrepo.spec
+++ b/createrepo.spec
@@ -3,7 +3,7 @@
 Summary: Creates a common metadata repository
 Name: createrepo
 Version: 0.9.9
-Release: 4%{?dist}
+Release: 5%{?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.2.29-1, python-deltarpm, deltarpm
+Requires: yum-metadata-parser, yum >= 3.4.3-4, python-deltarpm, deltarpm
 BuildRequires: python
 
 %description
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/createrepo
 
 %changelog
+* Wed Jul 20 2011 Seth Vidal <skvidal at fedoraproject.org> - 0.9.9-5
+- new patch to fix us breaking certain pungi configs
+
 * Tue Jul 19 2011 Seth Vidal <skvidal at fedoraproject.org> - 0.9.9-4
 - latest upstream head
 - change --update to use sqlite for old repodata