diff --git a/createrepo-head.patch b/createrepo-head.patch index b7858e5..4ee5f7a 100644 --- a/createrepo-head.patch +++ b/createrepo-head.patch @@ -12,7 +12,7 @@ index 0d4bbd8..57a0196 100644 %description This utility will generate a common metadata repository from a directory of diff --git a/createrepo/__init__.py b/createrepo/__init__.py -index 4601a15..77a03ee 100644 +index 4601a15..0ffe6cb 100644 --- a/createrepo/__init__.py +++ b/createrepo/__init__.py @@ -298,8 +298,8 @@ class MetaDataGenerator: @@ -26,6 +26,24 @@ index 4601a15..77a03ee 100644 return False +@@ -543,6 +543,17 @@ class MetaDataGenerator: + (othernode, self.otherfile)): + if node is None: + break ++ ++ if self.conf.baseurl: ++ anode = node.children ++ while anode is not None: ++ if anode.type != "element": ++ anode = anode.next ++ continue ++ if anode.name == "location": ++ anode.setProp('xml:base', self.conf.baseurl) ++ anode = anode.next ++ + output = node.serialize('UTF-8', self.conf.pretty) + if output: + outfile.write(output) diff --git a/createrepo/deltarpms.py b/createrepo/deltarpms.py index 26a6715..d14d3fa 100644 --- a/createrepo/deltarpms.py @@ -92,3 +110,16 @@ index 26a6715..d14d3fa 100644 def _stringToVersion(self, strng): i = strng.find(':') if i != -1: +diff --git a/createrepo/readMetadata.py b/createrepo/readMetadata.py +index 285e54d..6711d30 100644 +--- a/createrepo/readMetadata.py ++++ b/createrepo/readMetadata.py +@@ -136,7 +136,7 @@ class MetadataIndex(object): + if self.opts.get('verbose'): + print _("Size (%i -> %i) changed for file %s") % (size,st.st_size,filepath) + return +- if st.st_mtime != mtime: ++ if int(st.st_mtime) != mtime: + if self.opts.get('verbose'): + print _("Modification time changed for %s") % filepath + return diff --git a/createrepo.spec b/createrepo.spec index ee3b507..22e4624 100644 --- a/createrepo.spec +++ b/createrepo.spec @@ -3,7 +3,7 @@ Summary: Creates a common metadata repository Name: createrepo Version: 0.9.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Base Source: %{name}-%{version}.tar.gz @@ -46,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/createrepo %changelog +* 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