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:35:16 Branch: VENDOR Handle: 2010080623351500 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.3.3 [Release Tag: createrepo-0_3_3] Summary: Revision Changes Path 1.1.1.3 +40 -0 createrepo/ChangeLog 1.1.1.6 +1 -1 createrepo/Makefile 1.1.1.6 +8 -1 createrepo/createrepo.spec 1.1.1.5 +17 -11 createrepo/dumpMetadata.py ____________________________________________________________________________ patch -p0 <<'@@ .' Index: createrepo/ChangeLog ============================================================================ $ cvs diff -u -r1.1.1.2 -r1.1.1.3 ChangeLog --- createrepo/ChangeLog 6 Aug 2010 23:34:42 -0000 1.1.1.2 +++ createrepo/ChangeLog 6 Aug 2010 23:35:15 -0000 1.1.1.3 @@ -1,3 +1,43 @@ +2004-06-08 23:09 skvidal + + * Makefile, createrepo.spec, genpkgmetadata.py: + mark as 0.3.3 + +2004-06-06 18:38 skvidal + + * genpkgmetadata.py: + included a not-that-terribly accurate package count + +2004-06-05 14:38 skvidal + + * dumpMetadata.py, genpkgmetadata.py: + generate uncompressed checksums a much easier way. + +2004-06-05 14:31 skvidal + + * dumpMetadata.py, genpkgmetadata.py: + revert some changes + +2004-06-03 02:14 skvidal + + * genpkgmetadata.py: + fix stupid version thing + +2004-06-03 02:14 skvidal + + * dumpMetadata.py, genpkgmetadata.py: + keep checksum of uncompressed metadata files in repomd.xml + +2004-06-03 01:26 skvidal + + * dumpMetadata.py, genpkgmetadata.py: + move versioned prco from separate string to properties of the entry + +2004-04-16 01:15 skvidal + + * Makefile: + fix makefile + 2004-04-16 01:10 skvidal * Makefile, createrepo.spec, genpkgmetadata.py: @@ . patch -p0 <<'@@ .' Index: createrepo/Makefile ============================================================================ $ cvs diff -u -r1.1.1.5 -r1.1.1.6 Makefile --- createrepo/Makefile 6 Aug 2010 23:34:42 -0000 1.1.1.5 +++ createrepo/Makefile 6 Aug 2010 23:35:15 -0000 1.1.1.6 @@ -1,5 +1,5 @@ PACKAGE = createrepo -VERSION = 0.3.2 +VERSION = 0.3.3 SHELL = /bin/sh top_srcdir = . srcdir = . @@ . patch -p0 <<'@@ .' Index: createrepo/createrepo.spec ============================================================================ $ cvs diff -u -r1.1.1.5 -r1.1.1.6 createrepo.spec --- createrepo/createrepo.spec 6 Aug 2010 23:34:42 -0000 1.1.1.5 +++ createrepo/createrepo.spec 6 Aug 2010 23:35:15 -0000 1.1.1.6 @@ -1,6 +1,6 @@ Summary: Creates a common metadata repository Name: createrepo -Version: 0.3.2 +Version: 0.3.3 Release: 1 License: GPL Group: System Environment/Base @@ -33,6 +33,13 @@ %{_bindir}/%{name} %changelog +* Tue Jun 8 2004 Seth Vidal <[email protected]> +- update to the format +- versioned deps +- package counts +- uncompressed checksum in repomd.xml + + * Fri Apr 16 2004 Seth Vidal <[email protected]> - 0.3.2 - small addition of -p flag @@ . patch -p0 <<'@@ .' Index: createrepo/dumpMetadata.py ============================================================================ $ cvs diff -u -r1.1.1.4 -r1.1.1.5 dumpMetadata.py --- createrepo/dumpMetadata.py 6 Aug 2010 23:33:53 -0000 1.1.1.4 +++ createrepo/dumpMetadata.py 6 Aug 2010 23:35:15 -0000 1.1.1.5 @@ -14,9 +14,9 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# Copyright 2003 Duke University +# Copyright 2004 Duke University -# $Id: dumpMetadata.py,v 1.1.1.4 2010/08/06 23:33:53 jbj Exp $ +# $Id: dumpMetadata.py,v 1.1.1.5 2010/08/06 23:35:15 jbj Exp $ import os import rpm @@ -27,7 +27,7 @@ import struct import re import stat - +from genpkgmetadata import _gzipOpen def returnHdr(ts, package): """hand back the rpm header or raise an Error if the pkg is fubar""" @@ -504,8 +504,10 @@ hr.newProp('start', str(rpmObj.rangestart)) hr.newProp('end', str(rpmObj.rangeend)) #pkgNode.newChild(None, 'color', 'greenishpurple') - for (lst, nodename) in [(rpmObj.depsList(), 'requires'), (rpmObj.providesList(), 'provides'), - (rpmObj.conflictsList(), 'conflicts'), (rpmObj.obsoletesList(), 'obsoletes')]: + for (lst, nodename) in [(rpmObj.depsList(), 'requires'), + (rpmObj.providesList(), 'provides'), + (rpmObj.conflictsList(), 'conflicts'), + (rpmObj.obsoletesList(), 'obsoletes')]: if len(lst) > 0: rpconode = format.newChild(formatns, nodename, None) for (name, flags, (e,v,r)) in lst: @@ -518,14 +520,13 @@ if flags == 10: arg = 'LE' if flags == 12: arg = 'GE' entry.newProp('flags', arg) - if e or v or r: - version = entry.newChild(ns, 'version', None) + # if we've got a flag we've got a version, I hope :) if e: - version.newProp('epoch', str(e)) + entry.newProp('epoch', str(e)) if v: - version.newProp('ver', str(v)) + entry.newProp('ver', str(v)) if r: - version.newProp('rel', str(r)) + entry.newProp('rel', str(r)) for file in rpmObj.usefulFiles(): @@ -594,6 +595,9 @@ workfiles.append((cmds['groupfile'], 'group')) for (file, ftype) in workfiles: + zfo = _gzipOpen(os.path.join(cmds['tempdir'], file)) + uncsum = getChecksum(sumtype, zfo) + zfo.close() csum = getChecksum(sumtype, os.path.join(cmds['tempdir'], file)) timestamp = os.stat(os.path.join(cmds['tempdir'], file))[8] data = node.newChild(None, 'data', None) @@ -605,4 +609,6 @@ checksum = data.newChild(None, 'checksum', csum) checksum.newProp('type', sumtype) timestamp = data.newChild(None, 'timestamp', str(timestamp)) - + unchecksum = unchecksum = data.newChild(None, 'open-checksum', uncsum) + unchecksum.newProp('type', sumtype) + @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
