2006-06-15 11:40 lmacken

    * genpkgmetadata.py, docs/createrepo.8:
      Revert --update-info-location patch, since yum now supports arbitrary
      metadata via YumRepository::retrieveMD()

diff --git a/ChangeLog b/ChangeLog
index 41521650bc42152b78e022362693deebc37bfea6..308872847c44de89d6c4b60207c24cce0932db9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-15 10:41  lmacken
+
+       * genpkgmetadata.py, docs/createrepo.8:
+         Revert --update-info-location patch, since yum now supports arbitrary
+         metadata via YumRepository::retrieveMD()
+
 2006-03-04 01:28  pnasrat
 
        * createrepo.spec: release

diff --git a/docs/createrepo.8 b/docs/createrepo.8
index 1f92907f025e810ab2fdd8e109bec96eecff4be1..6af66ee950145d4d444c9f8e39b8f316e0ccfd46 100644 (file)
--- a/docs/createrepo.8
+++ b/docs/createrepo.8
@@ -36,9 +36,6 @@ change out of all packages this decreases the processing time dramatically.
 Run in split media mode. Rather than pass a single directory, take a set of
 directories corresponding to different volumes in a media set.
 .br
-.IP "\fB\-U --update-info-location\fP <url>"
-Query a specified server for package update metadata.
-.br
 .IP "\fB\-p --pretty\fP"
 Output xml files in pretty format.
 .IP "\fB\-V --version\fP"

diff --git a/genpkgmetadata.py b/genpkgmetadata.py
index d8c7455c6c73c4c829616f0d9d650255cbeedba3..513d9e8242a793a4f22aca1e339a59b3e04f8e31 100755 (executable)
--- a/genpkgmetadata.py
+++ b/genpkgmetadata.py
@@ -27,7 +27,6 @@ import rpm
 import libxml2
 import string
 import fnmatch
-import urlgrabber
 
 import dumpMetadata
 from dumpMetadata import _gzipOpen
@@ -56,7 +55,6 @@ def usage(retval=1):
                     (<filename> relative to directory-of-packages)
      -v, --verbose = run verbosely
      -c, --cachedir <dir> = specify which dir to use for the checksum cache
-     -U, --update-info-location <url> = acquire package update metadata
      -h, --help = show this help
      -V, --version = output version
      -p, --pretty = output xml files in pretty format.
@@ -187,29 +185,6 @@ class MetaDataGenerator:
                     errorprint(_('\nAn error occurred creating primary metadata: %s') % e)
                     continue
                 else:
-                    try:
-                        # Fetch the update metadata for this package
-                        if self.cmds['update-info-location']:
-                            metadata = urlgrabber.urlopen(
-                                    self.cmds['update-info-location'] +
-                                    '?pkg=%s' % file)
-                            filename = file.replace('.rpm', '.xml')
-                            metadata.filename = os.path.join(
-                                    self.cmds['basedir'], self.cmds['tempdir'],
-                                    self.cmds['update-info-dir'], filename)
-                            metadata._do_grab()
-                            metadata.close()
-
-                            # Get the update ID from the metadata
-                            md = libxml2.parseFile(metadata.filename)
-                            update_root = md.children
-                            update = node.newChild(None, 'update', None)
-                            update.newProp('id', update_root.prop('id'))
-                            update.newProp('location', os.path.join(
-                                    self.cmds['update-info-dir'], filename))
-                            del md, metadata
-                    except Exception, e:
-                        pass
                     output = node.serialize('UTF-8', self.cmds['pretty'])
                     self.basefile.write(output)
                     self.basefile.write('\n')
@@ -379,11 +354,11 @@ def parseArgs(args):
     cmds['dir-pattern-match'] = ['.*bin\/.*', '^\/etc\/.*']
 
     try:
-        gopts, argsleft = getopt.getopt(args, 'phqVvng:s:x:u:c:U:o:', ['help', 'exclude=',
+        gopts, argsleft = getopt.getopt(args, 'phqVvng:s:x:u:c:o:', ['help', 'exclude=',
                                                                   'quiet', 'verbose', 'cachedir=', 'basedir=',
                                                                   'baseurl=', 'groupfile=', 'checksum=',
                                                                   'version', 'pretty', 'split', 'outputdir=',
-                                                                  'update-info-location=', 'noepoch'])
+                                                                  'noepoch'])
     except getopt.error, e:
         errorprint(_('Options Error: %s.') % e)
         usage()
@@ -441,8 +416,6 @@ def parseArgs(args):
             elif arg in ['-c', '--cachedir']:
                 cmds['cache'] = True
                 cmds['cachedir'] = a
-            elif arg in ['-U', '--update-info-location']:
-                cmds['update-info-location'] = a
             elif arg == '--basedir':
                 cmds['basedir'] = a
             elif arg in ['-o','--outputdir']:
@@ -494,7 +467,6 @@ def parseArgs(args):
     cmds['tempdir'] = '.repodata'
     cmds['finaldir'] = 'repodata'
     cmds['olddir'] = '.olddata'
-    cmds['update-info-dir'] = 'update-info'
 
     return cmds, directories
 
@@ -527,12 +499,6 @@ def main(args):
         errorprint(_('Old data directory exists, please remove: %s') % cmds['olddir'])
         sys.exit(1)
 
-    if cmds.has_key('update-info-location'):
-        if not checkAndMakeDir(os.path.join(cmds['basedir'],
-                               cmds['tempdir'], cmds['update-info-dir'])):
-            errorprint(_('Error: cannot open/write to update info dir %s' % a))
-            usage()
-
     # make sure we can write to where we want to write to:
     for direc in ['tempdir', 'finaldir']:
         for file in ['primaryfile', 'filelistsfile', 'otherfile', 'repomdfile']:
@@ -584,14 +550,6 @@ def main(args):
                 errorprint(_('Error was %s') % e)
                 sys.exit(1)
 
-    # Clean up any update metadata
-    mdpath = os.path.join(cmds['basedir'], cmds['olddir'], cmds['update-info-dir'])
-    if os.path.isdir(mdpath):
-        for file in os.listdir(mdpath):
-            os.remove(os.path.join(mdpath, file))
-        os.rmdir(mdpath)
-
-
 #XXX: fix to remove tree as we mung basedir
     try:
         os.rmdir(os.path.join(cmds['outputdir'], cmds['olddir']))