rpms/createrepo/devel skip-if-no-old-repometata.patch, NONE, 1.1 createrepo.spec, 1.39, 1.40

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/extras/rpms/createrepo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8406

Modified Files:
	createrepo.spec 
Added Files:
	skip-if-no-old-repometata.patch 
Log Message:
patch to help rawhide builds



skip-if-no-old-repometata.patch:

--- NEW FILE skip-if-no-old-repometata.patch ---
diff --git a/createrepo/readMetadata.py b/createrepo/readMetadata.py
index ea2c400..faffe69 100644
--- a/createrepo/readMetadata.py
+++ b/createrepo/readMetadata.py
@@ -33,13 +33,17 @@ class MetadataIndex(object):
         self.outputdir = outputdir
         repodatadir = self.outputdir + '/repodata'
         myrepomdxml = repodatadir + '/repomd.xml'
-        repomd = repoMDObject.RepoMD('garbageid', myrepomdxml)
-        b = repomd.getData('primary').location[1]
-        f = repomd.getData('filelists').location[1]
-        o = repomd.getData('other').location[1]
-        basefile = os.path.join(self.outputdir, b)
-        filelistfile = os.path.join(self.outputdir, f)
-        otherfile = os.path.join(self.outputdir, o)
+        if os.path.exists(myrepomdxml):
+            repomd = repoMDObject.RepoMD('garbageid', myrepomdxml)
+            b = repomd.getData('primary').location[1]
+            f = repomd.getData('filelists').location[1]
+            o = repomd.getData('other').location[1]
+            basefile = os.path.join(self.outputdir, b)
+            filelistfile = os.path.join(self.outputdir, f)
+            otherfile = os.path.join(self.outputdir, o)
+        else:
+            basefile = filelistfile = otherfile = ""
+            
         self.files = {'base' : basefile,
                       'filelist' : filelistfile,
                       'other' : otherfile}


Index: createrepo.spec
===================================================================
RCS file: /cvs/extras/rpms/createrepo/devel/createrepo.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- createrepo.spec	30 Jan 2008 21:45:11 -0000	1.39
+++ createrepo.spec	31 Jan 2008 19:17:48 -0000	1.40
@@ -3,10 +3,11 @@
 Summary: Creates a common metadata repository
 Name: createrepo
 Version: 0.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
+Patch0: skip-if-no-old-repometata.patch
 URL: http://linux.duke.edu/projects/metadata/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 
 
 %build
 
@@ -41,6 +43,9 @@
 %{python_sitelib}/createrepo
 
 %changelog
+* Thu Jan 31 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.9.4-3
+- skip if no old metadata and --update was called.
+
 * Wed Jan 30 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.9.4-1
 - 0.9.4