[createrepo] update to latest HEAD

[Zdeněk Pavlas]

commit e7280d2a74da4bf65ef8d97cf68778c043dea6b7
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Wed Mar 6 11:58:11 2013 +0100

    update to latest HEAD

 createrepo-head.patch |   20 ++++++++++++++------
 createrepo.spec       |    7 ++++++-
 2 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/createrepo-head.patch b/createrepo-head.patch
index 6465940..9eb7b56 100644
--- a/createrepo-head.patch
+++ b/createrepo-head.patch
@@ -1499,7 +1499,7 @@ index 05e5f5e..80cb1a8 100755
  if __name__ == "__main__":
      main(sys.argv[1:])
 diff --git a/modifyrepo.py b/modifyrepo.py
-index 17094a4..bf1eec0 100755
+index 17094a4..acdde77 100755
 --- a/modifyrepo.py
 +++ b/modifyrepo.py
 @@ -1,11 +1,15 @@
@@ -1630,9 +1630,12 @@ index 17094a4..bf1eec0 100755
  
          new_rd = RepoData()
          new_rd.type = mdtype
-@@ -105,18 +144,28 @@ class RepoMetadata:
+@@ -103,20 +142,30 @@ class RepoMetadata:
+         new_rd.checksum = (self.checksum_type, csum)
+         new_rd.openchecksum = (self.checksum_type, open_csum)
          new_rd.size = str(os.stat(destmd).st_size)
-         new_rd.timestamp = str(os.stat(destmd).st_mtime)
+-        new_rd.timestamp = str(os.stat(destmd).st_mtime)
++        new_rd.timestamp = str(int(os.stat(destmd).st_mtime))
          self.repoobj.repoData[new_rd.type] = new_rd
 -        
 -        print "           type =", new_rd.type
@@ -1716,7 +1719,7 @@ index 17094a4..bf1eec0 100755
  if __name__ == '__main__':
      ret = main(sys.argv[1:])
 diff --git a/worker.py b/worker.py
-index eb35ef7..fe6758f 100755
+index eb35ef7..b67b5bd 100755
 --- a/worker.py
 +++ b/worker.py
 @@ -5,6 +5,7 @@ import yum
@@ -1747,7 +1750,12 @@ index eb35ef7..fe6758f 100755
      
      for strs in opts.pkgoptions:
          k,v = strs.split('=')
-@@ -64,15 +63,34 @@ def main(args):
+@@ -61,18 +60,39 @@ def main(args):
+             v = None
+         globalopts[k] = v
+ 
++    # turn off buffering on stdout
++    sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
      
      reldir = external_data['_reldir']
      ts = rpmUtils.transaction.initReadOnlyTransaction()
@@ -1787,7 +1795,7 @@ index eb35ef7..fe6758f 100755
              continue
  
          try:
-@@ -80,20 +98,17 @@ def main(args):
+@@ -80,20 +100,17 @@ def main(args):
                  print "reading %s" % (pkgfile)
  
              pkg = createrepo.yumbased.CreateRepoPackage(ts, package=pkgpath, 
diff --git a/createrepo.spec b/createrepo.spec
index 7fe4b72..4bdf6fb 100644
--- a/createrepo.spec
+++ b/createrepo.spec
@@ -3,7 +3,7 @@
 Summary: Creates a common metadata repository
 Name: createrepo
 Version: 0.9.9
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -47,6 +47,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/createrepo
 
 %changelog
+* Wed Mar  6 2013 Zdenek Pavlas <zpavlas at redhat.com> - 0.9.9-16
+- update to latest HEAD
+- turn off stdout buffering in worker to prevent a deadlock
+- modifyrepo: use integer timestamps
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild