[yum-git] debuginfo-install.py Makefile test/yum-utils-pylintrc yum-complete-transaction.py

[Tim Lauridsen]

 Makefile                    |    3 ++-
 debuginfo-install.py        |   10 ++++++----
 test/yum-utils-pylintrc     |    3 ++-
 yum-complete-transaction.py |    4 +---
 4 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 351ebbc3e06ac19d7f30ebebc8e16b184355eec0
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Wed Sep 24 12:54:00 2008 +0200

    add debuginfo-install to pylint check and cleaned up the problems also fixed some issues in yum-complete-transaction

diff --git a/Makefile b/Makefile
index 2a561d3..1207910 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,7 @@ ChangeLog: FORCE
 
 pylint:
 	@pylint --rcfile=test/yum-utils-pylintrc \
-		yumdownloader.py yum-complete-transaction.py yum-debug-dump.py yum-builddep.py
+		yumdownloader.py yum-complete-transaction.py yum-debug-dump.py yum-builddep.py \
+                debuginfo-install.py
 	
 FORCE:	
diff --git a/debuginfo-install.py b/debuginfo-install.py
index df1823c..009a7ab 100755
--- a/debuginfo-install.py
+++ b/debuginfo-install.py
@@ -21,9 +21,11 @@ sys.path.insert(0,'/usr/share/yum-cli/')
 import yum
 import yum.Errors
 
-from cli import *
 from utils import YumUtilBase
 
+import logging
+import rpmUtils
+
 
 class DebugInfoInstall(YumUtilBase):
     NAME = 'debuginfo-install'
@@ -39,11 +41,11 @@ class DebugInfoInstall(YumUtilBase):
                              DebugInfoInstall.VERSION,
                              DebugInfoInstall.USAGE)
         self.logger = logging.getLogger("yum.verbose.cli.debuginfoinstall")
+        # Add util commandline options to the yum-cli ones
+        self.optparser = self.getOptionParser() 
         self.main()
 
     def main(self):
-        # Add util commandline options to the yum-cli ones
-        self.optparser = self.getOptionParser() 
         # Parse the commandline option and setup the basics.
         opts = self.doUtilConfigSetup()
         # Check if there is anything to do.
@@ -126,7 +128,7 @@ if __name__ == '__main__':
     # does setlocale(LC_CTYPE, "")
     try:
         locale.setlocale(locale.LC_ALL, '')
-    except locale.Error, e:
+    except locale.Error, ex:
         # default to C locale if we get a failure.
         print >> sys.stderr, 'Failed to set locale, defaulting to C'
         os.environ['LC_ALL'] = 'C'
diff --git a/test/yum-utils-pylintrc b/test/yum-utils-pylintrc
index afd6d98..d9a78f5 100644
--- a/test/yum-utils-pylintrc
+++ b/test/yum-utils-pylintrc
@@ -63,7 +63,8 @@ load-plugins=
 # W0704: *Except doesn't do anything* ( Except xxxxxx,e : pass is ok)
 # W0612: *Unused variable %r* ( dont care if x,y,z = f() and y,z is not used) 
 # W0212: *Access to a protected member %s of a client class*  (if sucks, but we do that a lot)
-disable-msg=W0401,C0324,C0301,C0111,E1101,F0401,R0201,W0704,W0612,W0212
+# R0801: *Similar lines in %s files* (this is fine, some utils look alike)
+disable-msg=C0324,C0301,C0111,E1101,F0401,R0201,W0704,W0612,W0212,R0801
 
 
 [REPORTS]
diff --git a/yum-complete-transaction.py b/yum-complete-transaction.py
index 7bb7c5d..efafed6 100755
--- a/yum-complete-transaction.py
+++ b/yum-complete-transaction.py
@@ -20,7 +20,6 @@ sys.path.insert(0,'/usr/share/yum-cli')
 import yum
 from yum.misc import setup_locale
 
-from cli import *
 from utils import YumUtilBase
 
 import logging
@@ -110,6 +109,7 @@ class YumCompleteTransaction(YumUtilBase):
                              YumCompleteTransaction.VERSION,
                              YumCompleteTransaction.USAGE)
         self.logger = logging.getLogger("yum.verbose.cli.yumcompletets")
+        # Add util commandline options to the yum-cli ones
         self.optparser = self.getOptionParser()
         self.addCmdOptions()
         self.main()
@@ -129,8 +129,6 @@ class YumCompleteTransaction(YumUtilBase):
             help='Do not complete the transaction just clean up transaction journals')
 
     def main(self):
-        # Add util commandline options to the yum-cli ones
-        self.optparser = self.getOptionParser()
         # Parse the commandline option and setup the basics.
         try:
             opts = self.doUtilConfigSetup()