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:43
  Branch: VENDOR                           Handle: 2010080623354200

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

  Log:
    Import createrepo-0.3.4
    
    [Release Tag: createrepo-0_3_4]

  Summary:
    Revision    Changes     Path
    1.1.1.7     +5  -1      createrepo/createrepo.spec
    1.1.1.6     +82 -15     createrepo/dumpMetadata.py
    1.1.1.7     +23 -21     createrepo/genpkgmetadata.py
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: createrepo/createrepo.spec
  ============================================================================
  $ cvs diff -u -r1.1.1.6 -r1.1.1.7 createrepo.spec
  --- createrepo/createrepo.spec        6 Aug 2010 23:35:15 -0000       1.1.1.6
  +++ createrepo/createrepo.spec        6 Aug 2010 23:35:42 -0000       1.1.1.7
  @@ -1,6 +1,6 @@
   Summary: Creates a common metadata repository
   Name: createrepo
  -Version: 0.3.3
  +Version: 0.3.4
   Release: 1
   License: GPL
   Group: System Environment/Base
  @@ -33,6 +33,10 @@
   %{_bindir}/%{name}
   
   %changelog
  +* Mon Jul 19 2004 Seth Vidal <[email protected]>
  +- re-enable groups
  +- update num to 0.3.4
  +
   * Tue Jun  8 2004 Seth Vidal <[email protected]>
   - update to the format
   - versioned deps
  @@ .
  patch -p0 <<'@@ .'
  Index: createrepo/dumpMetadata.py
  ============================================================================
  $ cvs diff -u -r1.1.1.5 -r1.1.1.6 dumpMetadata.py
  --- createrepo/dumpMetadata.py        6 Aug 2010 23:35:15 -0000       1.1.1.5
  +++ createrepo/dumpMetadata.py        6 Aug 2010 23:35:42 -0000       1.1.1.6
  @@ -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.5 2010/08/06 23:35:15 jbj Exp $
  +# $Id: dumpMetadata.py,v 1.1.1.6 2010/08/06 23:35:42 jbj Exp $
   
   import os
   import rpm
  @@ -81,7 +81,7 @@
               
           return sum.hexdigest()
       except:
  -        raise MDError, 'Error opening file for checksum'
  +        raise MDError, 'Error opening file for checksum: %s' % file
   
   
   def utf8String(string):
  @@ -220,6 +220,24 @@
                   returnflags.append(newflag)
           return returnflags
   
  +    def _checkPreReq(self, flags):
  +        reqs=[]
  +        if flags is None:
  +            return reqs
  +
  +        if type(flags) is not types.ListType:
  +            flags = [flags]
  +        for flag in flags:
  +            newflag = flag
  +            if flag is not None:
  +                newflag = flag & 64
  +                if newflag == 64:
  +                    reqs.append(1)
  +                else:
  +                    reqs.append(0)
  +        return reqs
  +
  +
       def _correctVersion(self, vers):
           returnvers = []
           vertuple = (None, None, None)
  @@ -338,7 +356,14 @@
           return u
   
       def tagByName(self, tag):
  -        return self.hdr[tag]
  +        data = self.hdr[tag]
  +        if type(data) is types.ListType:
  +            if len(data) > 0:
  +                return data[0]
  +            else:
  +                return ''
  +        else:
  +            return data
       
       def listTagByName(self, tag):
           """take a tag that should be a list and make sure it is one"""
  @@ -411,9 +436,10 @@
           names = self.hdr[rpm.RPMTAG_REQUIRENAME]
           tmpflags = self.hdr[rpm.RPMTAG_REQUIREFLAGS]
           flags = self._correctFlags(tmpflags)
  +        prereq = self._checkPreReq(tmpflags)
           ver = self._correctVersion(self.hdr[rpm.RPMTAG_REQUIREVERSION])
           if names is not None:
  -            lst = zip(names, flags, ver)
  +            lst = zip(names, flags, ver, prereq)
           return self._uniq(lst)
           
       def obsoletesList(self):
  @@ -456,7 +482,7 @@
           return lst
       
       
  -def generateXML(doc, node, rpmObj, sumtype):
  +def generateXML(doc, node, formatns, rpmObj, sumtype):
       """takes an xml doc object and a package metadata entry node, populates 
a 
          package node with the md information"""
       ns = node.ns()
  @@ -490,13 +516,14 @@
       if rpmObj.localurl is not None:
           location.newProp('xml:base', rpmObj.localurl)
       location.newProp('href', rpmObj.relativepath)
  -    format = pkgNode.newChild(None, 'format', None)
  -    formatns = format.newNs('http://linux.duke.edu/metadata/rpm', 'rpm')
  +    format = pkgNode.newChild(ns, 'format', None)
  +    #formatns = format.newNs('http://linux.duke.edu/metadata/rpm', 'rpm')
  +    #format.setNs(ns)
       for tag in ['license', 'vendor', 'group', 'buildhost', 'sourcerpm']:
           value = rpmObj.tagByName(tag)
           value = utf8String(value)
           value = re.sub("\n$", '', value)
  -        entry = format.newChild(None, tag, None)
  +        entry = format.newChild(formatns, tag, None)
           value = xmlCleanString(doc, value)
           entry.addContent(value)
           
  @@ -504,8 +531,7 @@
       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'),
  +    for (lst, nodename) in [(rpmObj.providesList(), 'provides'),
                               (rpmObj.conflictsList(), 'conflicts'),
                               (rpmObj.obsoletesList(), 'obsoletes')]:
           if len(lst) > 0:               
  @@ -528,7 +554,29 @@
                       if r:
                           entry.newProp('rel', str(r))
   
  -    
  +    depsList = rpmObj.depsList()
  +    if len(depsList) > 0:
  +        rpconode = format.newChild(formatns, 'requires', None)    
  +        for (name, flags, (e,v,r), prereq) in depsList:
  +            entry = rpconode.newChild(formatns, 'entry', None)
  +            entry.newProp('name', name)
  +            if flags != 0:
  +                if flags == 2: arg = 'LT'
  +                if flags == 4: arg = 'GT'
  +                if flags == 8: arg = 'EQ'
  +                if flags == 10: arg = 'LE'
  +                if flags == 12: arg = 'GE'
  +                entry.newProp('flags', arg)
  +                # if we've got a flag we've got a version, I hope :)
  +                if e:
  +                    entry.newProp('epoch', str(e))
  +                if v:
  +                    entry.newProp('ver', str(v))
  +                if r:
  +                    entry.newProp('rel', str(r))
  +            if prereq == 1:
  +                entry.newProp('pre', str(prereq))
  +        
       for file in rpmObj.usefulFiles():
           files = format.newChild(None, 'file', None)
           file = xmlCleanString(doc, file)
  @@ -591,8 +639,6 @@
                    (cmds['filelistsfile'], 'filelists'),
                    (cmds['primaryfile'], 'primary')]
       
  -    if cmds['groupfile'] is not None:
  -        workfiles.append((cmds['groupfile'], 'group'))
       
       for (file, ftype) in workfiles:
           zfo = _gzipOpen(os.path.join(cmds['tempdir'], file))
  @@ -609,6 +655,27 @@
           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 = data.newChild(None, 'open-checksum', uncsum)
           unchecksum.newProp('type', sumtype)
  -        
  +    
  +    # if we've got a group file then checksum it once and be done
  +    if cmds['groupfile'] is not None:
  +        grpfile = cmds['groupfile']
  +        timestamp = os.stat(grpfile)[8]
  +        sfile = os.path.basename(grpfile)
  +        fo = open(grpfile, 'r')
  +        output = open(os.path.join(cmds['tempdir'], sfile), 'w')
  +        output.write(fo.read())
  +        output.close()
  +        csum = getChecksum(sumtype, fo)
  +        fo.close()
  +
  +        data = node.newChild(None, 'data', None)
  +        data.newProp('type', 'group')
  +        location = data.newChild(None, 'location', None)
  +        if cmds['baseurl'] is not None:
  +            location.newProp('xml:base', cmds['baseurl'])
  +        location.newProp('href', os.path.join(cmds['finaldir'], grpfile))
  +        checksum = data.newChild(None, 'checksum', csum)
  +        checksum.newProp('type', sumtype)
  +        timestamp = data.newChild(None, 'timestamp', str(timestamp))
  @@ .
  patch -p0 <<'@@ .'
  Index: createrepo/genpkgmetadata.py
  ============================================================================
  $ cvs diff -u -r1.1.1.6 -r1.1.1.7 genpkgmetadata.py
  --- createrepo/genpkgmetadata.py      6 Aug 2010 23:35:15 -0000       1.1.1.6
  +++ createrepo/genpkgmetadata.py      6 Aug 2010 23:35:42 -0000       1.1.1.7
  @@ -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.6 2010/08/06 23:35:15 jbj Exp $
  +# $Id: genpkgmetadata.py,v 1.1.1.7 2010/08/06 23:35:42 jbj Exp $
   
   
   import os
  @@ -33,7 +33,7 @@
   from gzip import write32u, FNAME
   
   import dumpMetadata
  -__version__ = '0.3.3'
  +__version__ = '0.3.4'
   
   def errorprint(stuff):
       print >> sys.stderr, stuff
  @@ -50,6 +50,7 @@
        -u, --baseurl = optional base url location for all files
        -x, --exclude = files globs to exclude, can be specified multiple times
        -q, --quiet = run quietly
  +     -g, --groupfile <filename> to point to for group information 
(precreated)
        -v, --verbose = run verbosely
        -s, --checksum = md5 or sha - select type of checksum to use (default: 
md5)
        -h, --help = show this help
  @@ -188,13 +189,16 @@
                       usage()
                   else:
                       cmds['baseurl'] = a
  -#            elif arg in ['-g', '--groupfile']:
  -#                if cmds['groupfile'] is not None:
  -#                    errorprint(_('Error: Only one groupfile allowed.'))
  -#                    usage()
  -#                else:
  -#                    cmds['groupfile'] = a
  -                    
  +            elif arg in ['-g', '--groupfile']:
  +                if cmds['groupfile'] is not None:
  +                    errorprint(_('Error: Only one groupfile allowed.'))
  +                    usage()
  +                else:
  +                    if os.path.exists(a):
  +                        cmds['groupfile'] = a
  +                    else:
  +                        errorprint(_('Error: groupfile %s cannot be found.' 
% a))
  +                        usage()
               elif arg in ['-x', '--exclude']:
                   cmds['excludes'].append(a)
               elif arg in ['-p', '--pretty']:
  @@ -231,11 +235,12 @@
       basedoc = libxml2.newDoc("1.0")
       baseroot =  basedoc.newChild(None, "metadata", None)
       basens = baseroot.newNs('http://linux.duke.edu/metadata/common', None)
  +    formatns = baseroot.newNs('http://linux.duke.edu/metadata/rpm', 'rpm')
       baseroot.setNs(basens)
       basefilepath = os.path.join(cmds['tempdir'], cmds['primaryfile'])
       basefile = _gzipOpen(basefilepath, 'w')
       basefile.write('<?xml version="1.0" encoding="UTF-8"?>\n')
  -    basefile.write('<metadata xmlns="http://linux.duke.edu/metadata/common"; 
packages="%s">\n' % 
  +    basefile.write('<metadata xmlns="http://linux.duke.edu/metadata/common"; 
xmlns:rpm="http://linux.duke.edu/metadata/rpm"; packages="%s">\n' % 
                      pkgcount)
   
       # setup the file list doc
  @@ -279,7 +284,7 @@
               continue
           else:
               try:
  -                node = dumpMetadata.generateXML(basedoc, baseroot, mdobj, 
cmds['sumtype'])
  +                node = dumpMetadata.generateXML(basedoc, baseroot, formatns, 
mdobj, cmds['sumtype'])
               except dumpMetadata.MDError, e:
                   errorprint(_('\nAn error occurred creating primary metadata: 
%s') % e)
                   continue
  @@ -401,13 +406,6 @@
           errorprint(_('Old data directory exists, please remove: %s') % 
cmds['olddir'])
           sys.exit(1)
           
  -    # check out the group file if specified
  -#    if cmds['groupfile'] is not None:
  -#        grpfile = os.path.join(directory, cmds['groupfile'])
  -#        if not os.access(grpfile, os.R_OK):
  -#            errorprint(_('Groupfile %s must exist and be readable') % 
grpfile)
  -#            usage()
  -
       # change to the basedir to work from w/i the path - for relative url 
paths
       os.chdir(directory)
   
  @@ -452,9 +450,12 @@
           os.chdir(curdir)
           sys.exit(1)
           
  -
  -    for file in ['primaryfile', 'filelistsfile', 'otherfile', 'repomdfile']:
  -        oldfile = os.path.join(cmds['olddir'], cmds[file])
  +    for file in ['primaryfile', 'filelistsfile', 'otherfile', 'repomdfile', 
'groupfile']:
  +        if cmds[file]:
  +            fn = os.path.basename(cmds[file])
  +        else:
  +            continue
  +        oldfile = os.path.join(cmds['olddir'], fn)
           if os.path.exists(oldfile):
               try:
                   os.remove(oldfile)
  @@ -463,6 +464,7 @@
                   errorprint(_('Error was %s') % e)
                   os.chdir(curdir)
                   sys.exit(1)
  +            
       try:
           os.rmdir(cmds['olddir'])
       except OSError, e:
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to