[Yum-devel] [PATCH 5/6] add prefix '(%s/%s): ' to blocking urlgrabs only

Zdeněk Pavlas zpavlas at redhat.com
Fri Jan 27 12:30:07 UTC 2012


---
 yum/__init__.py |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/yum/__init__.py b/yum/__init__.py
index 1478df7..3c2f375 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2195,16 +2195,14 @@ class YumBase(depsolve.Depsolve):
                 if po in errors:
                     del errors[po]
 
+            text = os.path.basename(po.relativepath)
             kwargs = {}
             if async and po.repo.async:
                 kwargs['failfunc'] = lambda obj, po=po: adderror(po, exception2msg(obj.exception))
                 kwargs['async'] = True
+            elif not (i == 1 and not local_size[0] and remote_size == po.size):
+                text = '(%s/%s): %s' % (i, len(remote_pkgs), text)
             try:
-                if i == 1 and not local_size[0] and remote_size == po.size:
-                    text = os.path.basename(po.relativepath)
-                else:
-                    text = '(%s/%s): %s' % (i, len(remote_pkgs),
-                                            os.path.basename(po.relativepath))
                 po.repo.getPackage(po,
                                    checkfunc=checkfunc,
                                    text=text,
-- 
1.7.4.4



More information about the Yum-devel mailing list