[yum-cvs] /yum-utils repoclosure.py,1.12,1.13

[Tim Lauridsen]

Update of /home/groups/yum/cvs//yum-utils
In directory login1.linux.duke.edu:/tmp/cvs-serv28746

Modified Files:
	repoclosure.py 
Log Message:
make it work with new Yum API (2.9.x) and replaced print statements with 
python logging.

Index: repoclosure.py
===================================================================
RCS file: /home/groups/yum/cvs//yum-utils/repoclosure.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- repoclosure.py	29 Jun 2006 14:57:25 -0000	1.12
+++ repoclosure.py	25 Sep 2006 06:52:20 -0000	1.13
@@ -23,6 +23,7 @@
 import sys
 import os
 
+import logging
 import yum
 import yum.Errors
 from yum.misc import getCacheDir
@@ -31,7 +32,6 @@
 from yum.constants import *
 from yum.packageSack import ListPackageSack
 
-
 def parseArgs():
     usage = "usage: %s [-c <config file>] [-a <arch>] [-r <repoid>] [-r <repoid2>]" % sys.argv[0]
     parser = OptionParser(usage=usage)
@@ -53,9 +53,9 @@
 class RepoClosure(yum.YumBase):
     def __init__(self, arch = None, config = "/etc/yum.conf"):
         yum.YumBase.__init__(self)
-
+        self.logger = logging.getLogger("yum.verbose.repoclosure")
         self.arch = arch
-        self.doConfigSetup(fn = config)
+        self.doConfigSetup(fn = config,init_plugins=False)
         if hasattr(self.repos, 'sqlite'):
             self.repos.sqlite = False
             self.repos._selectSackType()
@@ -129,9 +129,6 @@
                         
         return unresolved
     
-    
-    def log(self, value, msg):
-        pass
 
 def main():
     (opts, cruft) = parseArgs()
@@ -147,23 +144,23 @@
     if os.geteuid() != 0 or opts.tempcache:
         cachedir = getCacheDir()
         if cachedir is None:
-            print "Error: Could not make cachedir, exiting"
+            my.logger.error("Error: Could not make cachedir, exiting")
             sys.exit(50)
             
         my.repos.setCacheDir(cachedir)
 
     if not opts.quiet:
-        print 'Reading in repository metadata - please wait....'
+        my.logger.info('Reading in repository metadata - please wait....')
 
     try:
         my.readMetadata()
     except yum.Errors.RepoError, e:
-        print 'Filelists not available for repo: %s' % repo
-        print 'Some dependencies may not be complete for this repository'
-        print 'Run as root to get all dependencies or use -t to enable a user temp cache'
+        my.logger.info('Filelists not available for repo: %s' % repo)
+        my.logger.info('Some dependencies may not be complete for this repository')
+        my.logger.info('Run as root to get all dependencies or use -t to enable a user temp cache')
 
     if not opts.quiet:
-        print 'Checking Dependencies'
+        my.logger.info('Checking Dependencies')
 
     baddeps = my.getBrokenDeps(opts.newest)
     if opts.newest:
@@ -174,15 +171,15 @@
     repos = my.repos.listEnabled()
 
     if not opts.quiet:
-        print 'Repos looked at: %s' % len(repos)
+        my.logger.info('Repos looked at: %s' % len(repos))
         for repo in repos:
-            print '   %s' % repo
-        print 'Num Packages in Repos: %s' % num
+            my.logger.info('   %s' % repo)
+        my.logger.info('Num Packages in Repos: %s' % num)
     
     pkgs = baddeps.keys()
     pkgs.sort()
     for pkg in pkgs:
-        print 'package: %s from %s\n  unresolved deps: ' % (pkg, pkg.repoid)
+        my.logger.info('package: %s from %s\n  unresolved deps: ' % (pkg, pkg.repoid))
         for (n, f, v) in baddeps[pkg]:
             req = '%s' % n
             if f: 
@@ -191,7 +188,7 @@
             if v:
                 req = '%s %s' % (req, v)
             
-            print '     %s' % req
+            my.logger.info('     %s' % req)
 
 if __name__ == "__main__":
     main()