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:38:53
  Branch: VENDOR                           Handle: 2010080623385201

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

  Log:
    Import createrepo-0.4.0
    
    [Release Tag: createrepo-0_4_0]

  Summary:
    Revision    Changes     Path
    1.1.1.13    +1  -1      createrepo/Makefile
    1.1.1.2     +0  -0      createrepo/bin/createrepo
    1.1.1.13    +4  -1      createrepo/createrepo.spec
    1.1.1.13    +22 -13     createrepo/genpkgmetadata.py
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: createrepo/Makefile
  ============================================================================
  $ cvs diff -u -r1.1.1.12 -r1.1.1.13 Makefile
  --- createrepo/Makefile       6 Aug 2010 23:38:19 -0000       1.1.1.12
  +++ createrepo/Makefile       6 Aug 2010 23:38:53 -0000       1.1.1.13
  @@ -1,5 +1,5 @@
   PACKAGE = createrepo
  -VERSION = 0.3.9
  +VERSION = 0.4.0
   SHELL = /bin/sh
   top_srcdir = .
   srcdir = .
  @@ .
  patch -p0 <<'@@ .'
  Index: createrepo/bin/createrepo
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 bin/createrepo
  @@ .
  patch -p0 <<'@@ .'
  Index: createrepo/createrepo.spec
  ============================================================================
  $ cvs diff -u -r1.1.1.12 -r1.1.1.13 createrepo.spec
  --- createrepo/createrepo.spec        6 Aug 2010 23:38:19 -0000       1.1.1.12
  +++ createrepo/createrepo.spec        6 Aug 2010 23:38:53 -0000       1.1.1.13
  @@ -1,6 +1,6 @@
   Summary: Creates a common metadata repository
   Name: createrepo
  -Version: 0.3.9
  +Version: 0.4.0
   Release: 1
   License: GPL
   Group: System Environment/Base
  @@ -33,6 +33,9 @@
   %{_bindir}/%{name}
   
   %changelog
  +* Mon Oct 11 2004 Seth Vidal <[email protected]>
  +- 0.4.0
  +
   * Thu Sep 30 2004 Seth Vidal <[email protected]>
   - 0.3.9
   - fix for groups checksum creation
  @@ .
  patch -p0 <<'@@ .'
  Index: createrepo/genpkgmetadata.py
  ============================================================================
  $ cvs diff -u -r1.1.1.12 -r1.1.1.13 genpkgmetadata.py
  --- createrepo/genpkgmetadata.py      6 Aug 2010 23:38:19 -0000       1.1.1.12
  +++ createrepo/genpkgmetadata.py      6 Aug 2010 23:38:52 -0000       1.1.1.13
  @@ -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.12 2010/08/06 23:38:19 jbj Exp $
  +# $Id: genpkgmetadata.py,v 1.1.1.13 2010/08/06 23:38:52 jbj Exp $
   
   
   import os
  @@ -33,7 +33,7 @@
   from gzip import write32u, FNAME
   
   import dumpMetadata
  -__version__ = '0.3.9'
  +__version__ = '0.4.0'
   
   def errorprint(stuff):
       print >> sys.stderr, stuff
  @@ -42,7 +42,7 @@
       """Stub function for translation"""
       return args
       
  -def usage():
  +def usage(retval=1):
       print _("""
       createrepo [options] directory-of-packages
       
  @@ -58,7 +58,7 @@
        -p, --pretty = output xml files in pretty format.
       """) 
   
  -    sys.exit(1)
  +    sys.exit(retval)
   
   
   def getFileList(path, ext, filelist):
  @@ -150,8 +150,6 @@
          Parse the command line args return a commands dict and directory.
          Sanity check all the things being passed in.
       """
  -    if  len(args) == 0:
  -        usage()
       cmds = {}
       cmds['quiet'] = 0
       cmds['verbose'] = 0
  @@ -170,21 +168,32 @@
       except getopt.error, e:
           errorprint(_('Options Error: %s.') % e)
           usage()
  +
  +    try: 
  +        for arg,a in gopts:
  +            if arg in ['-h','--help']:
  +                usage(retval=0)
  +            elif arg in ['-V', '--version']:
  +                print '%s' % __version__
  +                sys.exit(0)
  +    except ValueError, e:
  +        errorprint(_('Options Error: %s') % e)
  +        usage()
  +    
  +
       # make sure our dir makes sense before we continue
  -    if len(argsleft) != 1:
  +    if len(argsleft) > 1:
           errorprint(_('Error: Only one directory allowed per run.'))
           usage()
  +    elif len(argsleft) == 0:
  +        errorprint(_('Error: Must specify a directory to index.'))
  +        usage()
       else:
           directory = argsleft[0]
      
       try: 
           for arg,a in gopts:
  -            if arg in ['-h','--help']:
  -                usage()
  -            elif arg in ['-V', '--version']:
  -                print '%s' % __version__
  -                sys.exit(0)
  -            elif arg == '-v':
  +            if arg == '-v':
                   cmds['verbose'] = 1
               elif arg == "-q":
                   cmds['quiet'] = 1
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to