[yum-commits] Branch 'yum-3_2_X' - cli.py output.py yumcommands.py yum/comps.py yummain.py yum/repos.py yum/rpmsack.py yum/sqlitesack.py

[Tim Lauridsen]

 cli.py            |    2 +-
 output.py         |    3 ++-
 yum/comps.py      |    3 ++-
 yum/repos.py      |    7 +++----
 yum/rpmsack.py    |    2 +-
 yum/sqlitesack.py |    3 ++-
 yumcommands.py    |    3 +--
 yummain.py        |    2 +-
 8 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit d0ed077f779050930cdcd09b2618966482a430bb
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Mon Mar 30 11:25:45 2009 +0200

    fixup regrestion introduced by removing unused imports from yum.misc

diff --git a/cli.py b/cli.py
index c77c765..67d10d1 100644
--- a/cli.py
+++ b/cli.py
@@ -43,7 +43,7 @@ from yum.rpmtrans import RPMTransaction
 import signal
 import yumcommands
 
-from yum.misc import to_unicode, to_utf8
+from yum.i18n import to_unicode, to_utf8
 
 def sigquit(signum, frame):
     """ SIGQUIT handler for the yum cli. """
diff --git a/output.py b/output.py
index dee8826..79127bd 100755
--- a/output.py
+++ b/output.py
@@ -29,7 +29,8 @@ import re # For YumTerm
 from urlgrabber.progress import TextMeter
 import urlgrabber.progress
 from urlgrabber.grabber import URLGrabError
-from yum.misc import prco_tuple_to_string, to_str, to_utf8, to_unicode
+from yum.misc import prco_tuple_to_string
+from yum.i18n import to_str, to_utf8, to_unicode
 import yum.misc
 from rpmUtils.miscutils import checkSignals
 from yum.constants import *
diff --git a/yum/comps.py b/yum/comps.py
index ac20652..cf203f1 100755
--- a/yum/comps.py
+++ b/yum/comps.py
@@ -26,7 +26,8 @@ from Errors import CompsException
 # switch all compsexceptions to grouperrors after api break
 import fnmatch
 import re
-from yum.misc import to_unicode, get_my_lang_code
+from yum.i18n import to_unicode
+from misc import get_my_lang_code
 
 lang_attr = '{http://www.w3.org/XML/1998/namespace}lang'
 
diff --git a/yum/repos.py b/yum/repos.py
index 5185d98..0fba1c6 100644
--- a/yum/repos.py
+++ b/yum/repos.py
@@ -75,10 +75,9 @@ class RepoStorage:
         for repo in repos:
             repo.setup(self.ayum.conf.cache, self.ayum.mediagrabber,
                    gpg_import_func = self.gpg_import_func, confirm_func=self.confirm_func)
-            num += 1
-            
-        if self.callback and len(repos) > 0:
-            self.callback.progressbar(num, len(repos), repo.id)
+            num += 1            
+            if self.callback and len(repos) > 0:
+                self.callback.progressbar(num, len(repos), repo.id)
 
         self._setup = True
         self.ayum.plugins.run('postreposetup')
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 1d0945b..1abe6b6 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -28,7 +28,7 @@ from packageSack import PackageSackBase
 import fnmatch
 import re
 
-from misc import to_unicode
+from yum.i18n import to_unicode
 import constants
 
 class RPMInstalledPackage(YumInstalledPackage):
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index d1a756d..fea9d8c 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -34,7 +34,8 @@ import sqlutils
 import constants
 import operator
 import time
-from yum.misc import seq_max_split, to_utf8, to_unicode
+from yum.misc import seq_max_split
+from yum.i18n import to_utf8, to_unicode
 import sys
 
 def catchSqliteException(func):
diff --git a/yumcommands.py b/yumcommands.py
index 351afe7..34a0195 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -28,8 +28,7 @@ import operator
 import locale
 import fnmatch
 import time
-from yum.misc import to_unicode
-from yum.i18n import utf8_width, utf8_width_fill
+from yum.i18n import utf8_width, utf8_width_fill, to_unicode
 
 def checkRootUID(base):
     """
diff --git a/yummain.py b/yummain.py
index 4d330af..93cea0a 100755
--- a/yummain.py
+++ b/yummain.py
@@ -28,7 +28,7 @@ from yum import Errors
 from yum import plugins
 from yum import logginglevels
 from yum import _
-from yum.misc import to_unicode
+from yum.i18n import to_unicode
 import yum.misc
 import cli