rpms/mash/devel 0001-Don-t-include-repodata-in-the-previous-path.patch, NONE, 1.1 mash.spec, 1.68, 1.69

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/mash/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18788

Modified Files:
	mash.spec 
Added Files:
	0001-Don-t-include-repodata-in-the-previous-path.patch 
Log Message:
* Tue Apr 20 2010 Jesse Keating <jkeating at redhat.com> - 0.5.15-2
- Add a patch to correctly set previous repodata path


0001-Don-t-include-repodata-in-the-previous-path.patch:
 __init__.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Don-t-include-repodata-in-the-previous-path.patch ---
>From 0c185b62db9ae5f50a376f17d0d7da507d150226 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at redhat.com>
Date: Tue, 20 Apr 2010 14:45:55 -0700
Subject: [PATCH] Don't include "repodata" in the previous path.

Createrepo already looks for the repodata/ directory and finds things
within.  If we add the repodata directory to the previous_path name
createrepo doesn't find any existing repodata to re-use.  This has
slowed down composes likely since December of 2008.
---
 mash/__init__.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mash/__init__.py b/mash/__init__.py
index 9357d37..fb94400 100644
--- a/mash/__init__.py
+++ b/mash/__init__.py
@@ -232,7 +232,7 @@ class Mash:
             if self.config.previous:
                 prefix = os.path.join(self.config.outputdir, self.config.name, "")
                 suffix = repo_path.replace(prefix, "")
-                previous_path = os.path.join(self.config.previous, suffix, "repodata")
+                previous_path = os.path.join(self.config.previous, suffix)
             self.logger.info("createrepo: starting %s..." % (path,))
             status = self._makeMetadata(repo_path, repocache, arch, comps, previous = previous_path)
 
-- 
1.7.0.1



Index: mash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mash/devel/mash.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- mash.spec	16 Apr 2010 21:49:03 -0000	1.68
+++ mash.spec	20 Apr 2010 21:50:17 -0000	1.69
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.5.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -13,6 +13,7 @@ Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
 BuildRequires:  python-devel
 BuildArch:      noarch
+Patch0:         0001-Don-t-include-repodata-in-the-previous-path.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -21,6 +22,7 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Tue Apr 20 2010 Jesse Keating <jkeating at redhat.com> - 0.5.15-2
+- Add a patch to correctly set previous repodata path
+
 * Fri Apr 16 2010 Bill Nottingham <notting at redhat.com> 0.5.15-1
 - branched compose configuration tweaks
 - speed up composes a teeny bit