Merge lp:~bcfg2/bcfg2/yum-tools into lp:bcfg2/stable

[David Strauss]

Unmerged revisions

2482. By David Strauss on 2010-03-24

Add working support for generating a list based on installed modules. Add somewhat-broken support for reading from the Yum metadata cache.

=== modified file 'tools/pkgmgr_gen.py'
--- tools/pkgmgr_gen.py	2009-11-17 20:36:04 +0000
+++ tools/pkgmgr_gen.py	2010-03-24 07:39:29 +0000
@@ -20,6 +20,7 @@
 import urllib
 import gzip
 import urlparse
+import subprocess
 from lxml.etree import parse
 import xml.sax
 from xml.sax.handler import ContentHandler
@@ -211,7 +212,42 @@
            if self.inArch:
                self.package['subarch'] += content
 
-def loadRepos(repolist):
+def loadInstalled():
+    packages = {}       
+    lines = subprocess.Popen(['rpm', '-qa', '--queryformat', '%{NAME},%{EPOCH},%{VERSION},%{RELEASE},%{ARCH}\n'], stdout = subprocess.PIPE).communicate()[0].split("\n")
+    for line in lines:
+        if len(line) > 0:
+            name, epoch, version, release, subarch = line.split(",")
+            if subarch == '(none)':
+                subarch = 'noarch'
+            if epoch == '(none)':
+                epoch = None
+            file = name + '-' + version + '-' + release + '.' + subarch + '.rpm'
+            new = True
+            if name in packages:
+                for instance in packages[name]:
+                    if subarch == instance['arch']:
+                        new = False
+            if new and (subarch in subarchs or 'all' in subarchs):
+                # Store what we want in our structure.
+                packages.setdefault(name, []).append({'filename':file, 'mtime':'', 'name':name, \
+                                                      'arch':subarch, 'epoch':epoch, 'version':version, \
+                                                      'release':release})
+    return packages
+
+def loadCache():
+    prefix = '/var/cache/yum'
+    repolist = []
+    for dirname in os.listdir(prefix):
+        if os.path.isdir(prefix + '/' + dirname):
+            repolist.append('file://' + prefix + '/' + dirname + '/')
+
+    if options.verbose:
+        print repolist
+
+    return loadRepos(repolist, True)
+
+def loadRepos(repolist, cache_mode = False):
     '''
        repolist is a list of urls to yum repositories.
 
@@ -239,16 +275,19 @@
     '''
     packages = {}
     for repo in repolist:
-        url = urlparse.urljoin(repo, './repodata/repomd.xml')
+        if cache_mode:
+          url = urlparse.urljoin(repo, './repomd.xml')
+        else:
+          url = urlparse.urljoin(repo, './repodata/repomd.xml')
 
         if options.verbose:
             print 'Loading repo metadata : %s' % url
 
-        try:
-            opener = pkgmgr_URLopener()
-            file, message = opener.retrieve(url)
-        except:
-            sys.exit()
+        #try:
+        opener = pkgmgr_URLopener()
+        file, message = opener.retrieve(url)
+        #except:
+        #    sys.exit()
 
         try:
             tree = parse(file)
@@ -263,7 +302,10 @@
                     if property.tag.endswith('location'):
                         primaryhref = property.get('href')
 
-        url = urlparse.urljoin(repo, './' + primaryhref)
+        if cache_mode:
+          url = urlparse.urljoin(repo, './' + primaryhref.split('/')[-1])
+        else:
+          url = urlparse.urljoin(repo, './' + primaryhref)
 
         if options.verbose:
             print 'Loading : %s' % url
@@ -372,6 +414,10 @@
         package_dict = loadRpms(search_dirs)
     elif options.yumrepos:
         package_dict = loadRepos(repos)
+    elif options.yumcache:
+        package_dict = loadCache()
+    elif options.installed:
+        package_dict = loadInstalled()
 
     if options.verbose:
         print 'Processing package headers'
@@ -426,6 +472,14 @@
                                    help='''Comma separated list of directories to scan for RPMS.
                                            Wilcards are permitted.
                                         ''')
+    
+    p.add_option('--yumcache', '-c', action='store_true',
+                                   help='''Use the Yum cache to find packages. This option currently
+                                           fails for cache items stored with sqlite.
+                                        ''')
+
+    p.add_option('--installed', '-I', action='store_true',
+                                   help='Use the installed set of packages.')
 
     p.add_option('--enddate', '-e', action='store', \
                                    type='string', \
@@ -495,8 +549,8 @@
         print "Option --uri must be specified to produce a PackageList Tag for rpm formatted files."
         sys.exit(1)
 
-    if not options.rpmdirs and not options.yumrepos:
-        print "One of --rpmdirs and --yumrepos must be specified"
+    if not options.rpmdirs and not options.yumrepos and not options.yumcache and not options.installed:
+        print "One of --rpmdirs, --yumrepos, --installed, or --yumcache must be specified"
         sys.exit(1)
 
     # Set up list of directories to search