[Git][reproducible-builds/diffoscope][master] 2 commits: Tidy generation of os_list.

Chris Lamb (@lamby) gitlab at salsa.debian.org
Tue Nov 29 11:06:17 UTC 2022



Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
f0be250e by Chris Lamb at 2022-11-29T10:59:17+00:00
Tidy generation of os_list.

- - - - -
81903e0b by Chris Lamb at 2022-11-29T11:05:09+00:00
Support both python3-progressbar and python3-progressbar2, two modules providing the "progressbar" Python module. (Closes: reproducible-builds/diffoscope#323)

- - - - -


2 changed files:

- diffoscope/progress.py
- diffoscope/tools.py


Changes:

=====================================
diffoscope/progress.py
=====================================
@@ -267,7 +267,7 @@ class ProgressBar:
         self.msg = msg
 
         self.bar.maxval = total
-        self.bar.currval = current
+        self.bar.value = current
         self.bar.update()
 
     def finish(self):


=====================================
diffoscope/tools.py
=====================================
@@ -70,7 +70,8 @@ def get_tools(only_missing=False):
     d["External-Tools-Required"] = tuple(external_tools)
 
     current_os = get_current_os()
-    os_list = [current_os] if (current_os in OS_NAMES) else iter(OS_NAMES)
+    os_list = [current_os] if current_os in OS_NAMES else OS_NAMES
+
     for os_ in os_list:
         tools = set()
         for x in external_tools:



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/792115b9f6c3c61e8a957ce8c73fe6c78713aede...81903e0bfa5d7b5eb2a8b56754389d01ef387aa0

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/792115b9f6c3c61e8a957ce8c73fe6c78713aede...81903e0bfa5d7b5eb2a8b56754389d01ef387aa0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20221129/ae7517d5/attachment.htm>


More information about the rb-commits mailing list