Merge branch 'improve_missing_progressbar_module_handling' of https://github.com/lethliel/osc

Unbreak "osc build" output in case of a missing progressbar module (this
slipped in in commit 8a6abe3a6c ("warn user
if python-progressbar is not installed")). This change has some
"disadvantages":
- a print in fetch.py, which is always executed in in case of a missing
  progressbar (an external user might just import the verify_* functions)
- an explicit print in get_binary_file, which is actually the task of
  *some* progress_obj

For an alternative "fix", see [1]. Anyway, merged...

[1] https://github.com/openSUSE/osc/pull/502#issuecomment-453165987

osc/commandline.py

@@ -167,6 +167,7 @@ class Osc(cmdln.Cmdln):
         self.download_progress = None
         if conf.config.get('show_download_progress', False):
             from .meter import TextMeter
+            if TextMeter:
                 self.download_progress = TextMeter()
 
 

osc/core.py

@@ -4618,10 +4618,14 @@ def get_binary_file(apiurl, prj, repo, arch,
     progress_obj = None
     if progress_meter:
         from .meter import TextMeter
+        if TextMeter:
             progress_obj = TextMeter()
 
     target_filename = target_filename or filename
 
+    if progress_meter and not progress_obj:
+        print('Downloading %s' % target_filename)
+
     where = package or '_repository'
     u = makeurl(apiurl, ['build', prj, repo, arch, where, filename])
     download(u, target_filename, progress_obj, target_mtime)

osc/fetch.py

@@ -25,6 +25,8 @@ import re
 
 from .meter import TextMeter
 
+if not TextMeter:
+    print('Please install the progressbar module')
 
 class Fetcher:
     def __init__(self, cachedir='/tmp', api_host_options={}, urllist=[],

osc/meter.py

@@ -28,18 +28,9 @@ class PBTextMeter(object):
     def end(self):
         self.bar.finish()
 
-class NoPBTextMeter(object):
-    def start(self, *args, **kwargs):
-        print('Please install the progressbar module...')
-
-    def update(self, *args, **kwargs):
-        pass
-
-    def end(self, *args, **kwargs):
-        pass
 
 if have_pb_module:
     TextMeter = PBTextMeter
 else:
-    TextMeter = NoPBTextMeter
+    TextMeter = None
 # vim: sw=4 et