diff --git a/.cvsignore b/.cvsignore index 33f9ac1..2e41862 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mash-0.5.10.tar.gz +mash-0.5.16.tar.gz diff --git a/mash-debug.patch b/mash-debug.patch new file mode 100644 index 0000000..0b6c28e --- /dev/null +++ b/mash-debug.patch @@ -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 + diff --git a/mash.spec b/mash.spec index bb984a4..4bd0350 100644 --- a/mash.spec +++ b/mash.spec @@ -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 0.5.16-1 +- fix use of prior repodata () + +* Fri Apr 16 2010 Bill Nottingham 0.5.15-1 +- branched compose configuration tweaks +- speed up composes a teeny bit + +* Tue Feb 23 2010 Bill Nottingham 0.5.14-1 +- further changes for NFR () + +* Fri Feb 19 2010 Bill Nottingham 0.5.13-1 +- assorted fixes for no-frozen-rawhide +- make package hash directories all lowercase + +* Wed Feb 17 2010 Bill Nottingham 0.5.12-1 +- adjust for branched trees and no-frozen-rawhide () +- allow for source repos to be optional () +- allow for pulling all builds, not just latest () +- enable hashed packages for rawhide + +* Fri Dec 18 2009 Bill Nottingham 0.5.11-1 +- allow package directories to be hashed by the package name + (adapted from ) + * Mon Nov 16 2009 Bill Nottingham 0.5.10-1 - fix up distro_tags and content_tags - bump rawhide version diff --git a/sources b/sources index fc177f7..eb61acc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c88ae3b5b50cac20c8e93b7d5fea389e mash-0.5.10.tar.gz +c488dc6acfbcb47cb4a13a6113c768e2 mash-0.5.16.tar.gz