rpms/mash/devel mash-debug.patch,NONE,1.1 mash.spec,1.48,1.49

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2264

Modified Files:
	mash.spec 
Added Files:
	mash-debug.patch 
Log Message:
Add some debugging so we can see where rawhide's going wrong.


mash-debug.patch:

--- NEW FILE mash-debug.patch ---
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()


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- mash.spec	8 May 2009 14:22:37 -0000	1.48
+++ mash.spec	10 Jun 2009 03:45:03 -0000	1.49
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.5.5
-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
+Patch1:		mash-debug.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
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Tue Jun  9 2009 Bill Nottingham <notting at redhat.com> 0.5.5-2
+- add debugging cruft
+
 * Fri May  8 2009 Bill Nottingham <notting at redhat.com> 0.5.5-1
 - fix setting delta_dirs in config file
 - canonicalize -o option if passed as a relative path