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:34:42
  Branch: VENDOR                           Handle: 2010080623344200

  Modified files:           (Branch: VENDOR)
    createrepo              ChangeLog Makefile createrepo.spec
                            genpkgmetadata.py
  Touched files:            (Branch: VENDOR)
    createrepo              dumpMetadata.py
    createrepo/bin          Makefile createrepo

  Log:
    Import createrepo-0.3.2
    
    [Release Tag: createrepo-0_3_2]

  Summary:
    Revision    Changes     Path
    1.1.1.2     +23 -0      createrepo/ChangeLog
    1.1.1.5     +2  -2      createrepo/Makefile
    1.1.1.5     +4  -1      createrepo/createrepo.spec
    1.1.1.5     +11 -8      createrepo/genpkgmetadata.py
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: createrepo/ChangeLog
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 ChangeLog
  --- createrepo/ChangeLog      6 Aug 2010 23:32:22 -0000       1.1.1.1
  +++ createrepo/ChangeLog      6 Aug 2010 23:34:42 -0000       1.1.1.2
  @@ -1,3 +1,26 @@
  +2004-04-16 01:10  skvidal
  +
  +     * Makefile, createrepo.spec, genpkgmetadata.py: 
  +     update to 0.3.2 added -p or --pretty flag to make it pretty-print
  +     the xml output not pretty printing the output makes the import a
  +     lot faster and the data smaller
  +
  +2004-01-18 16:43  skvidal
  +
  +     * Makefile, createrepo.spec, dumpMetadata.py, genpkgmetadata.py: 
  +     1. make it actually work :) 2. bump to 0.3.1
  +
  +2004-01-18 12:57  skvidal
  +
  +     * Makefile, createrepo.spec: 
  +     add README for real *boggle*
  +
  +2004-01-18 12:56  skvidal
  +
  +     * Makefile, README, createrepo.spec: 
  +     tagged Makefile and createrepo as 0.3 Add README to both of the
  +     above
  +
   2004-01-18 11:45  skvidal
   
        * genpkgmetadata.py: 
  @@ .
  patch -p0 <<'@@ .'
  Index: createrepo/Makefile
  ============================================================================
  $ cvs diff -u -r1.1.1.4 -r1.1.1.5 Makefile
  --- createrepo/Makefile       6 Aug 2010 23:33:53 -0000       1.1.1.4
  +++ createrepo/Makefile       6 Aug 2010 23:34:42 -0000       1.1.1.5
  @@ -1,5 +1,5 @@
   PACKAGE = createrepo
  -VERSION = 0.3.1
  +VERSION = 0.3.2
   SHELL = /bin/sh
   top_srcdir = .
   srcdir = .
  @@ -135,7 +135,7 @@
        $(srcdir)/Makefile \
        $(srcdir)/ChangeLog \
        $(srcdir)/README \
  -     $(srcdir)/$(PACKAGE).spec
  +     $(srcdir)/$(PACKAGE).spec \
        $(top_srcdir)/.disttmp/$$distdir
        for subdir in $(SUBDIRS) ; do \
          $(MAKE) -C $$subdir dailyfiles VERSION=$(VERSION) PACKAGE=$(PACKAGE); 
\
  @@ .
  patch -p0 <<'@@ .'
  Index: createrepo/createrepo.spec
  ============================================================================
  $ cvs diff -u -r1.1.1.4 -r1.1.1.5 createrepo.spec
  --- createrepo/createrepo.spec        6 Aug 2010 23:33:53 -0000       1.1.1.4
  +++ createrepo/createrepo.spec        6 Aug 2010 23:34:42 -0000       1.1.1.5
  @@ -1,6 +1,6 @@
   Summary: Creates a common metadata repository
   Name: createrepo
  -Version: 0.3.1
  +Version: 0.3.2
   Release: 1
   License: GPL
   Group: System Environment/Base
  @@ -33,6 +33,9 @@
   %{_bindir}/%{name}
   
   %changelog
  +* Fri Apr 16 2004 Seth Vidal <[email protected]>
  +- 0.3.2 - small addition of -p flag
  +
   * Sun Jan 18 2004 Seth Vidal <[email protected]>
   - I'm an idiot
   
  @@ .
  patch -p0 <<'@@ .'
  Index: createrepo/genpkgmetadata.py
  ============================================================================
  $ cvs diff -u -r1.1.1.4 -r1.1.1.5 genpkgmetadata.py
  --- createrepo/genpkgmetadata.py      6 Aug 2010 23:33:53 -0000       1.1.1.4
  +++ createrepo/genpkgmetadata.py      6 Aug 2010 23:34:42 -0000       1.1.1.5
  @@ -17,7 +17,7 @@
   # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   # Copyright 2003 Duke University
   
  -# $Id: genpkgmetadata.py,v 1.1.1.4 2010/08/06 23:33:53 jbj Exp $
  +# $Id: genpkgmetadata.py,v 1.1.1.5 2010/08/06 23:34:42 jbj Exp $
   
   
   import os
  @@ -54,7 +54,7 @@
        -s, --checksum = md5 or sha - select type of checksum to use (default: 
md5)
        -h, --help = show this help
        -V, --version = output version
  -
  +     -p, --pretty = output xml files in pretty format.
       """) % os.path.basename(sys.argv[0])
       
   
  @@ -159,13 +159,14 @@
       cmds['baseurl'] = None
       cmds['groupfile'] = None
       cmds['sumtype'] = 'md5'
  -
  +    cmds['pretty'] = 0
   
       try:
  -        gopts, argsleft = getopt.getopt(args, 'hqVvg:s:x:u:', ['help', 
'exclude', 
  +        gopts, argsleft = getopt.getopt(args, 'phqVvg:s:x:u:', ['help', 
'exclude', 
                                                                 'quiet', 
'verbose', 
                                                                 'baseurl=', 
'groupfile=',
  -                                                              'checksum=', 
'version'])
  +                                                              'checksum=', 
'version',
  +                                                              'pretty'])
       except getopt.error, e:
           errorprint(_('Options Error: %s.') % e)
           usage()
  @@ -196,6 +197,8 @@
                       
               elif arg in ['-x', '--exclude']:
                   cmds['excludes'].append(a)
  +            elif arg in ['-p', '--pretty']:
  +                cmds['pretty'] = 1
               elif arg in ['-s', '--checksum']:
                   if a not in ['md5', 'sha']:
                       errorprint(_('Error: checksums are: md5 or sha.'))
  @@ -275,7 +278,7 @@
                   errorprint(_('\nAn error occurred creating primary metadata: 
%s') % e)
                   continue
               else:
  -                output = node.serialize(None, 1)
  +                output = node.serialize(None, cmds['pretty'])
                   basefile.write(output)
                   basefile.write('\n')
                   node.unlinkNode()
  @@ -288,7 +291,7 @@
                   errorprint(_('\nAn error occurred creating filelists: %s') % 
e)
                   continue
               else:
  -                output = node.serialize(None, 1)
  +                output = node.serialize(None, cmds['pretty'])
                   flfile.write(output)
                   flfile.write('\n')
                   node.unlinkNode()
  @@ -301,7 +304,7 @@
                   errorprint(_('\nAn error occurred: %s') % e)
                   continue
               else:
  -                output = node.serialize(None, 1)
  +                output = node.serialize(None, cmds['pretty'])
                   otherfile.write(output)
                   otherfile.write('\n')
                   node.unlinkNode()
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to