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:40:03 Branch: VENDOR Handle: 2010080623400200 Added files: (Branch: VENDOR) createrepo/docs Makefile createrepo.8 Modified files: (Branch: VENDOR) createrepo ChangeLog Makefile createrepo.spec genpkgmetadata.py Touched files: (Branch: VENDOR) createrepo README createrepo/bin Makefile createrepo Log: Import createrepo-0.4.2 [Release Tag: createrepo-0_4_2] Summary: Revision Changes Path 1.1.1.7 +42 -0 createrepo/ChangeLog 1.1.1.15 +5 -5 createrepo/Makefile 1.1.1.15 +9 -1 createrepo/createrepo.spec 1.1.1.1 +0 -0 createrepo/docs/Makefile 1.1.1.1 +0 -0 createrepo/docs/createrepo.8 1.1.1.15 +16 -35 createrepo/genpkgmetadata.py ____________________________________________________________________________ patch -p0 <<'@@ .' Index: createrepo/ChangeLog ============================================================================ $ cvs diff -u -r1.1.1.6 -r1.1.1.7 ChangeLog --- createrepo/ChangeLog 6 Aug 2010 23:39:36 -0000 1.1.1.6 +++ createrepo/ChangeLog 6 Aug 2010 23:40:02 -0000 1.1.1.7 @@ -1,3 +1,45 @@ +2005-01-18 02:14 skvidal + + * Makefile, docs/Makefile: + fix the Makefiles, f'real + +2005-01-18 01:59 skvidal + + * docs/: Makefile, createrepo.8: + real commit + +2005-01-18 01:58 skvidal + + * Makefile, createrepo.spec: + adding man page and upating the Makefiles and specfile accordingly. + Thanks Bob Kashani for the man page. + +2005-01-18 01:24 skvidal + + * dumpMetadata.py: + need to seek to the beginning before doing a new read operation. + +2005-01-17 02:52 skvidal + + * Makefile, createrepo.spec: + spec and Makefile to 0.4.2 + +2005-01-17 02:52 skvidal + + * dumpMetadata.py, genpkgmetadata.py: + move around gzipOpen for use in another program relabel 0.4.2 + +2005-01-07 16:39 skvidal + + * dumpMetadata.py, genpkgmetadata.py: + single open for all file operations. about a 30% time savings. + +2004-11-02 00:55 skvidal + + * genpkgmetadata.py: + small fix for --exclude to work. -x works, but --exclude didn't, + now it is fixed + 2004-10-21 03:42 skvidal * Makefile, createrepo.spec, genpkgmetadata.py: @@ . patch -p0 <<'@@ .' Index: createrepo/Makefile ============================================================================ $ cvs diff -u -r1.1.1.14 -r1.1.1.15 Makefile --- createrepo/Makefile 6 Aug 2010 23:39:35 -0000 1.1.1.14 +++ createrepo/Makefile 6 Aug 2010 23:40:02 -0000 1.1.1.15 @@ -1,5 +1,5 @@ PACKAGE = createrepo -VERSION = 0.4.1 +VERSION = 0.4.2 SHELL = /bin/sh top_srcdir = . srcdir = . @@ -18,7 +18,7 @@ docdir = includedir = ${prefix}/include oldincludedir = /usr/include -mandir = ${prefix}/man +mandir = ${prefix}/share/man pkgdatadir = $(datadir)/$(PACKAGE) pkglibdir = $(libdir)/$(PACKAGE) @@ -26,7 +26,7 @@ top_builddir = # all dirs -DIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(pkgdatadir) +DIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(mandir) # INSTALL scripts @@ -37,7 +37,7 @@ INSTALL_MODULES = $(INSTALL) -m 755 -D RM = rm -f -SUBDIRS = bin +SUBDIRS = bin docs MODULES = $(srcdir)/genpkgmetadata.py \ $(srcdir)/dumpMetadata.py @@ -49,7 +49,7 @@ all: $(MODULES) for subdir in $(SUBDIRS) ; do \ - $(MAKE) -C $$subdir VERSION=$(VERSION) PACKAGE=$(PACKAGE); \ + $(MAKE) -C $$subdir VERSION=$(VERSION) PACKAGE=$(PACKAGE) DESTDIR=$(DESTDIR); \ done check: @@ . patch -p0 <<'@@ .' Index: createrepo/createrepo.spec ============================================================================ $ cvs diff -u -r1.1.1.14 -r1.1.1.15 createrepo.spec --- createrepo/createrepo.spec 6 Aug 2010 23:39:36 -0000 1.1.1.14 +++ createrepo/createrepo.spec 6 Aug 2010 23:40:02 -0000 1.1.1.15 @@ -1,6 +1,6 @@ Summary: Creates a common metadata repository Name: createrepo -Version: 0.4.1 +Version: 0.4.2 Release: 1 License: GPL Group: System Environment/Base @@ -31,8 +31,16 @@ %doc ChangeLog README %{_datadir}/%{name}/* %{_bindir}/%{name} +%{_mandir}/man8/createrepo.8* %changelog +* Tue Jan 18 2005 Seth Vidal <[email protected]> +- add man page + +* Mon Jan 17 2005 Seth Vidal <[email protected]> +- 0.4.2 + + * Thu Oct 21 2004 Seth Vidal <[email protected]> - ghost files not being added into primary file list if matching regex @@ . patch -p0 <<'@@ .' Index: createrepo/docs/Makefile ============================================================================ $ cvs diff -u -r0 -r1.1.1.1 docs/Makefile @@ . patch -p0 <<'@@ .' Index: createrepo/docs/createrepo.8 ============================================================================ $ cvs diff -u -r0 -r1.1.1.1 docs/createrepo.8 @@ . patch -p0 <<'@@ .' Index: createrepo/genpkgmetadata.py ============================================================================ $ cvs diff -u -r1.1.1.14 -r1.1.1.15 genpkgmetadata.py --- createrepo/genpkgmetadata.py 6 Aug 2010 23:39:35 -0000 1.1.1.14 +++ createrepo/genpkgmetadata.py 6 Aug 2010 23:40:02 -0000 1.1.1.15 @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Copyright 2004 Duke University -# $Id: genpkgmetadata.py,v 1.1.1.14 2010/08/06 23:39:35 jbj Exp $ +# $Id: genpkgmetadata.py,v 1.1.1.15 2010/08/06 23:40:02 jbj Exp $ import os @@ -27,13 +27,10 @@ import libxml2 import string import fnmatch -# done to fix gzip randomly changing the checksum -import gzip -from zlib import error as zlibError -from gzip import write32u, FNAME import dumpMetadata -__version__ = '0.4.1' +from dumpMetadata import _gzipOpen +__version__ = '0.4.2' def errorprint(stuff): print >> sys.stderr, stuff @@ -123,28 +120,6 @@ return result -# this is done to make the hdr writing _more_ sane for rsync users especially -__all__ = ["GzipFile","open"] - -class GzipFile(gzip.GzipFile): - def _write_gzip_header(self): - self.fileobj.write('\037\213') # magic header - self.fileobj.write('\010') # compression method - fname = self.filename[:-3] - flags = 0 - if fname: - flags = FNAME - self.fileobj.write(chr(flags)) - write32u(self.fileobj, long(0)) - self.fileobj.write('\002') - self.fileobj.write('\377') - if fname: - self.fileobj.write(fname + '\000') - - -def _gzipOpen(filename, mode="rb", compresslevel=9): - return GzipFile(filename, mode, compresslevel) - def parseArgs(args): """ Parse the command line args return a commands dict and directory. @@ -158,13 +133,15 @@ cmds['groupfile'] = None cmds['sumtype'] = 'sha' cmds['pretty'] = 0 +# cmds['updategroupsonly'] = 0 + cmds['file-pattern-match'] = ['.*bin\/.*', '^\/etc\/.*', '^\/usr\/lib\/sendmail$'] + cmds['dir-pattern-match'] = ['.*bin\/.*', '^\/etc\/.*'] try: - gopts, argsleft = getopt.getopt(args, 'phqVvg:s:x:u:', ['help', 'exclude', - 'quiet', 'verbose', - 'baseurl=', 'groupfile=', - 'checksum=', 'version', - 'pretty']) + gopts, argsleft = getopt.getopt(args, 'phqVvg:s:x:u:', ['help', 'exclude=', + 'quiet', 'verbose', + 'baseurl=', 'groupfile=', 'checksum=', + 'version', 'pretty']) except getopt.error, e: errorprint(_('Options Error: %s.') % e) usage() @@ -217,6 +194,8 @@ cmds['excludes'].append(a) elif arg in ['-p', '--pretty']: cmds['pretty'] = 1 +# elif arg in ['--update-groups-only']: +# cmds['updategroupsonly'] = 1 elif arg in ['-s', '--checksum']: if a not in ['md5', 'sha']: errorprint(_('Error: checksums are: md5 or sha.')) @@ -494,8 +473,10 @@ if __name__ == "__main__": if len(sys.argv) > 1: if sys.argv[1] == 'profile': - import profile - profile.run('main(sys.argv[2:])') + import hotshot + p = hotshot.Profile(os.path.expanduser("~/createrepo.prof")) + p.run('main(sys.argv[2:])') + p.close() else: main(sys.argv[1:]) else: @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
