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:36:07
  Branch: VENDOR                           Handle: 2010080623360600

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

  Log:
    Import createrepo-0.3.5
    
    [Release Tag: createrepo-0_3_5]

  Summary:
    Revision    Changes     Path
    1.1.1.8     +1  -1      createrepo/Makefile
    1.1.1.8     +4  -1      createrepo/createrepo.spec
    1.1.1.7     +13 -5      createrepo/dumpMetadata.py
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: createrepo/Makefile
  ============================================================================
  $ cvs diff -u -r1.1.1.7 -r1.1.1.8 Makefile
  --- createrepo/Makefile       6 Aug 2010 23:35:42 -0000       1.1.1.7
  +++ createrepo/Makefile       6 Aug 2010 23:36:06 -0000       1.1.1.8
  @@ -1,5 +1,5 @@
   PACKAGE = createrepo
  -VERSION = 0.3.4
  +VERSION = 0.3.5
   SHELL = /bin/sh
   top_srcdir = .
   srcdir = .
  @@ .
  patch -p0 <<'@@ .'
  Index: createrepo/createrepo.spec
  ============================================================================
  $ cvs diff -u -r1.1.1.7 -r1.1.1.8 createrepo.spec
  --- createrepo/createrepo.spec        6 Aug 2010 23:35:42 -0000       1.1.1.7
  +++ createrepo/createrepo.spec        6 Aug 2010 23:36:06 -0000       1.1.1.8
  @@ -1,6 +1,6 @@
   Summary: Creates a common metadata repository
   Name: createrepo
  -Version: 0.3.4
  +Version: 0.3.5
   Release: 1
   License: GPL
   Group: System Environment/Base
  @@ -33,6 +33,9 @@
   %{_bindir}/%{name}
   
   %changelog
  +* Fri Jul 23 2004 Seth Vidal <[email protected]>
  +- fix for broken filelists
  +
   * Mon Jul 19 2004 Seth Vidal <[email protected]>
   - re-enable groups
   - update num to 0.3.4
  @@ .
  patch -p0 <<'@@ .'
  Index: createrepo/dumpMetadata.py
  ============================================================================
  $ cvs diff -u -r1.1.1.6 -r1.1.1.7 dumpMetadata.py
  --- createrepo/dumpMetadata.py        6 Aug 2010 23:35:42 -0000       1.1.1.6
  +++ createrepo/dumpMetadata.py        6 Aug 2010 23:36:06 -0000       1.1.1.7
  @@ -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.6 2010/08/06 23:35:42 jbj Exp $
  +# $Id: dumpMetadata.py,v 1.1.1.7 2010/08/06 23:36:06 jbj Exp $
   
   import os
   import rpm
  @@ -396,13 +396,21 @@
           filemodes = self.listTagByName('filemodes')
           filetuple = zip(files, filemodes, fileflags)
           for (file, mode, flag) in filetuple:
  +            #garbage checks
  +            if file == '' or file is None:
  +                continue
  +            if mode is None:
  +                continue
               if stat.S_ISDIR(mode):
  -                self.dirnames.append(file)                
  +                self.dirnames.append(file)
               else:
  -                if (flag & 64): 
  -                    self.ghostnames.append(file)
  -                else:
  +                if flag is None:
                       self.filenames.append(file)
  +                else:
  +                    if (flag & 64): 
  +                        self.ghostnames.append(file)
  +                    else:
  +                        self.filenames.append(file)
   
           
       def usefulFiles(self):
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to