rpms/mash/EL-6 mash-debug.patch, 1.4, 1.5 .cvsignore, 1.47, 1.48 mash.spec, 1.61, 1.62 sources, 1.49, 1.50

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/mash/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30800

Modified Files:
	.cvsignore mash.spec sources 
Added Files:
	mash-debug.patch 
Log Message:
sync from devel


mash-debug.patch:
 b/mash/metadata.py |    8 ++++++++
 mash/metadata.py   |    1 +
 2 files changed, 9 insertions(+)

Index: mash-debug.patch
===================================================================
RCS file: mash-debug.patch
diff -N mash-debug.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mash-debug.patch	11 May 2010 18:43:01 -0000	1.5
@@ -0,0 +1,54 @@
+diff --git a/mash/metadata.py b/mash/metadata.py
+index 56bb377..b381833 100644
+--- a/mash/metadata.py
++++ b/mash/metadata.py
+@@ -113,21 +113,26 @@ class MetadataNew:
+                 return True
+ 
+         def _matches(file, list):
++            self.logger.info("Checking drpm %s" % (file,))
+             hdr = rpmUtils.miscutils.hdrFromPackage(ts, file)
+             fname = '%s-%s-%s.%s.rpm' % (hdr['name'], hdr['version'], hdr['release'], hdr['arch'])
+             if fname in list.keys():
+                 if _sigmatches(hdr, list[fname]):
++                    self.logger.info("Finished checking drpm %s - success" % (file,))
+                     return True
++            self.logger.info("Finished checking drpm %s - fail" % (file,))
+             return False
+ 
+         def _copy(file, path):
+             if not os.path.exists('%s/drpms' % (path,)):
+                 os.mkdir('%s/drpms' % (path,))
+             destpath = '%s/drpms/%s' % (path, os.path.basename(file))
++            self.logger.info("Copying drpm %s" % (file,))
+             try:
+                 os.link(file, destpath)
+             except OSError:
+                 shutil.copy(file, destpath)
++            self.logger.info("Finished copying drpm %s" % (file,))
+ 
+         fulllist = self.repomatic.getFileList(self.conf.directory, '.rpm')
+         filelist = {}
+@@ -150,7 +155,10 @@ class MetadataNew:
+                 except OSError:
+                     self.logger.error("Couldn't copy repodata from %s" % (self.previous,))
+             if self.conf.deltas:
++                self.logger.info("Starting to copy old deltas for %s" % (path,))
+                 self._copy_in_deltas(path)
++                self.logger.info("Finished copying old deltas for %s" % (path,))
++        self.logger.info("Creating metadata for %s" % (path,))
+         self.repomatic.doPkgMetadata()
+         self.repomatic.doRepoMetadata()
+         self.repomatic.doFinalMove()
+diff --git a/mash/metadata.py b/mash/metadata.py
+index 938172a..59069c8 100644
+--- a/mash/metadata.py
++++ b/mash/metadata.py
+@@ -68,6 +68,7 @@ class MetadataNew:
+         self.conf.update = True
+         self.conf.quiet = True
+         self.conf.unique_md_filenames = True
++        self.conf.profile = True
+         self.previous = None
+         self.logger = logger
+ 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mash/EL-6/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	1 Dec 2009 20:58:06 -0000	1.47
+++ .cvsignore	11 May 2010 18:43:01 -0000	1.48
@@ -1 +1 @@
-mash-0.5.10.tar.gz
+mash-0.5.16.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mash/EL-6/mash.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- mash.spec	1 Dec 2009 20:58:07 -0000	1.61
+++ mash.spec	11 May 2010 18:43:01 -0000	1.62
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.5.10
+Version:        0.5.16
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,30 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Wed Apr 21 2010 Bill Nottingham <notting at redhat.com> 0.5.16-1
+- fix use of prior repodata (<jkeating at redhat.com>)
+
+* Fri Apr 16 2010 Bill Nottingham <notting at redhat.com> 0.5.15-1
+- branched compose configuration tweaks
+- speed up composes a teeny bit
+
+* Tue Feb 23 2010 Bill Nottingham <notting at redhat.com> 0.5.14-1
+- further changes for NFR (<jkeating at redhat.com>)
+
+* Fri Feb 19 2010 Bill Nottingham <notting at redhat.com> 0.5.13-1
+- assorted fixes for no-frozen-rawhide
+- make package hash directories all lowercase
+
+* Wed Feb 17 2010 Bill Nottingham <notting at redhat.com> 0.5.12-1
+- adjust for branched trees and no-frozen-rawhide (<jkeating at redhat.com>)
+- allow for source repos to be optional (<jgregusk at redhat.com>)
+- allow for pulling all builds, not just latest (<kanarip at fedoraunity.org>)
+- enable hashed packages for rawhide
+
+* Fri Dec 18 2009 Bill Nottingham <notting at redhat.com> 0.5.11-1
+- allow package directories to be hashed by the package name
+  (adapted from <skvidal at fedoraproject.org>)
+
 * Mon Nov 16 2009 Bill Nottingham <notting at redhat.com> 0.5.10-1
 - fix up distro_tags and content_tags
 - bump rawhide version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mash/EL-6/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	1 Dec 2009 20:58:07 -0000	1.49
+++ sources	11 May 2010 18:43:01 -0000	1.50
@@ -1 +1 @@
-c88ae3b5b50cac20c8e93b7d5fea389e  mash-0.5.10.tar.gz
+c488dc6acfbcb47cb4a13a6113c768e2  mash-0.5.16.tar.gz