RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: createrepo Date: 07-Aug-2010 01:39:36 Branch: VENDOR Handle: 2010080623393501 Modified files: (Branch: VENDOR) createrepo ChangeLog Makefile createrepo.spec dumpMetadata.py Touched files: (Branch: VENDOR) createrepo README createrepo/bin Makefile createrepo Log: Import createrepo-0.4.1 [Release Tag: createrepo-0_4_1] Summary: Revision Changes Path 1.1.1.6 +33 -0 createrepo/ChangeLog 1.1.1.14 +1 -1 createrepo/Makefile 1.1.1.14 +7 -1 createrepo/createrepo.spec 1.1.1.12 +19 -3 createrepo/dumpMetadata.py ____________________________________________________________________________ patch -p0 <<'@@ .' Index: createrepo/ChangeLog ============================================================================ $ cvs diff -u -r1.1.1.5 -r1.1.1.6 ChangeLog --- createrepo/ChangeLog 6 Aug 2010 23:38:19 -0000 1.1.1.5 +++ createrepo/ChangeLog 6 Aug 2010 23:39:36 -0000 1.1.1.6 @@ -1,3 +1,36 @@ +2004-10-21 03:42 skvidal + + * Makefile, createrepo.spec, genpkgmetadata.py: + update version numbers + +2004-10-21 03:40 skvidal + + * dumpMetadata.py: + problem with ghost entries not showing up in primary.xml even if + they matched the regex strings. + +2004-10-18 01:41 skvidal + + * bin/createrepo: + whoops! need to quote that var string + +2004-10-11 07:43 skvidal + + * Makefile, createrepo.spec, genpkgmetadata.py: + correct problem with handling dirs with a space in the filename + update version number + +2004-10-03 23:43 skvidal + + * genpkgmetadata.py: + clean up argument parsing to handle --version and --help more + correctly. Not quite the patch Ville Skyttä submitted. + +2004-09-30 01:54 skvidal + + * genpkgmetadata.py: + one more place to tag + 2004-09-30 01:52 skvidal * Makefile, createrepo.spec: @@ . patch -p0 <<'@@ .' Index: createrepo/Makefile ============================================================================ $ cvs diff -u -r1.1.1.13 -r1.1.1.14 Makefile --- createrepo/Makefile 6 Aug 2010 23:38:53 -0000 1.1.1.13 +++ createrepo/Makefile 6 Aug 2010 23:39:35 -0000 1.1.1.14 @@ -1,5 +1,5 @@ PACKAGE = createrepo -VERSION = 0.4.0 +VERSION = 0.4.1 SHELL = /bin/sh top_srcdir = . srcdir = . @@ . patch -p0 <<'@@ .' Index: createrepo/createrepo.spec ============================================================================ $ cvs diff -u -r1.1.1.13 -r1.1.1.14 createrepo.spec --- createrepo/createrepo.spec 6 Aug 2010 23:38:53 -0000 1.1.1.13 +++ createrepo/createrepo.spec 6 Aug 2010 23:39:36 -0000 1.1.1.14 @@ -1,6 +1,6 @@ Summary: Creates a common metadata repository Name: createrepo -Version: 0.4.0 +Version: 0.4.1 Release: 1 License: GPL Group: System Environment/Base @@ -33,6 +33,12 @@ %{_bindir}/%{name} %changelog +* Thu Oct 21 2004 Seth Vidal <[email protected]> +- ghost files not being added into primary file list if + matching regex +- 0.4.1 + + * Mon Oct 11 2004 Seth Vidal <[email protected]> - 0.4.0 @@ . patch -p0 <<'@@ .' Index: createrepo/dumpMetadata.py ============================================================================ $ cvs diff -u -r1.1.1.11 -r1.1.1.12 dumpMetadata.py --- createrepo/dumpMetadata.py 6 Aug 2010 23:38:19 -0000 1.1.1.11 +++ createrepo/dumpMetadata.py 6 Aug 2010 23:39:36 -0000 1.1.1.12 @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Copyright 2004 Duke University -# $Id: dumpMetadata.py,v 1.1.1.11 2010/08/06 23:38:19 jbj Exp $ +# $Id: dumpMetadata.py,v 1.1.1.12 2010/08/06 23:39:36 jbj Exp $ import os import rpm @@ -423,7 +423,18 @@ returns[item] = 1 return returns - + def usefulGhosts(self): + """search for useful ghost file names""" + returns = {} + for item in self.ghostnames: + if item is None: + continue + for glob in self.filerc: + if glob.match(item): + returns[item] = 1 + return returns + + def usefulDirs(self): """search for good dirs""" returns = {} @@ -588,7 +599,12 @@ directory = utf8String(directory) files.addContent(directory) files.newProp('type', 'dir') - + for directory in rpmObj.usefulGhosts(): + files = format.newChild(None, 'file', None) + directory = utf8String(directory) + files.addContent(directory) + files.newProp('type', 'ghost') + return pkgNode def fileListXML(doc, node, rpmObj): @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
