[yum-git] 2 commits - Makefile test/yum-utils-pylintrc yum-builddep.py yum-util-cli-template

[Tim Lauridsen]

 Makefile                |    4 ++--
 test/yum-utils-pylintrc |    2 +-
 yum-builddep.py         |   14 +++++++-------
 yum-util-cli-template   |    1 -
 4 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit f3150a30ef93ffa232e1aa1ffe3bc6d95a8b6873
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Wed Sep 24 12:40:20 2008 +0200

    remove cli wildcard import

diff --git a/yum-util-cli-template b/yum-util-cli-template
index 0c0f176..29c7b59 100644
--- a/yum-util-cli-template
+++ b/yum-util-cli-template
@@ -20,7 +20,6 @@ sys.path.insert(0,'/usr/share/yum-cli/')
 import yum
 import yum.Errors
 
-from cli import *
 from utils import YumUtilBase
 
 
commit 9fd77d328072c93d833c31e3dea076cff1b22f92
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Wed Sep 24 12:39:09 2008 +0200

    add yum-builddep to pylint check and cleaned up the problems

diff --git a/Makefile b/Makefile
index c66c36b..2a561d3 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ ChangeLog: FORCE
 	@git log --pretty --numstat --summary | ./tools/git2cl > ChangeLog
 
 pylint:
-	@pylint --rcfile=test/yum-utils-pylintrc yumdownloader.py yum-complete-transaction.py yum-debug-dump.py
-	
+	@pylint --rcfile=test/yum-utils-pylintrc \
+		yumdownloader.py yum-complete-transaction.py yum-debug-dump.py yum-builddep.py
 	
 FORCE:	
diff --git a/test/yum-utils-pylintrc b/test/yum-utils-pylintrc
index 5b78a76..afd6d98 100644
--- a/test/yum-utils-pylintrc
+++ b/test/yum-utils-pylintrc
@@ -13,7 +13,7 @@
 
 # Python code to execute, usually for sys.path manipulation such as
 # pygtk.require().
-#init-hook='import sys.path; sys.path.insert(0,"/usr/share/yum-cli")'
+#init-hook=="execfile('test/pylint-setup.py')"
 
 # Profiled execution.
 profile=no
diff --git a/yum-builddep.py b/yum-builddep.py
index 6d64000..2fafdc5 100755
--- a/yum-builddep.py
+++ b/yum-builddep.py
@@ -18,13 +18,12 @@ import sys
 sys.path.insert(0,'/usr/share/yum-cli')
 
 import yum
-from yum.misc import getCacheDir, setup_locale
+from yum.misc import setup_locale
 
-from cli import *
 from utils import YumUtilBase
 
-from urlparse import urljoin
-from urlgrabber.progress import TextMeter
+import logging
+import rpmUtils
 
 
 class YumBuildDep(YumUtilBase):
@@ -38,11 +37,11 @@ class YumBuildDep(YumUtilBase):
                              YumBuildDep.VERSION,
                              YumBuildDep.USAGE)
         self.logger = logging.getLogger("yum.verbose.cli.yumbuildep")                             
+        # 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.
         try:
             opts = self.doUtilConfigSetup()
@@ -126,7 +125,8 @@ class YumBuildDep(YumUtilBase):
 
         for srpm in srpms:
             for dep in srpm.requiresList():
-                if dep.startswith("rpmlib("): continue
+                if dep.startswith("rpmlib("): 
+                    continue
                 try:
                     pkg = self.returnPackageByDep(dep)
                     print pkg