diff options
| -rwxr-xr-x | bin/disk_info | 4 | ||||
| -rwxr-xr-x | bin/graphics_driver | 4 | ||||
| -rwxr-xr-x | bin/memory_compare | 8 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | po/pl.po | 4 | ||||
| -rw-r--r-- | po/zh_TW.po | 4 |
6 files changed, 18 insertions, 10 deletions
diff --git a/bin/disk_info b/bin/disk_info index d32bc13d..b1b73df7 100755 --- a/bin/disk_info +++ b/bin/disk_info @@ -63,7 +63,9 @@ def main(): disk_size = ("%dGB" % ( int(disk.find('size').text) / (1000**3))) except TypeError: - disk_size = "Unknown" + disk_size = "No Reported Size" + except AttributeError: + disk_size = "No Reported Size" print("\t{k:15}\t{v}".format(k="Size:", v=disk_size)) return 0 diff --git a/bin/graphics_driver b/bin/graphics_driver index 91568e17..b1b1cb76 100755 --- a/bin/graphics_driver +++ b/bin/graphics_driver @@ -199,12 +199,12 @@ class XorgLog(object): display = {'Output': display_name} continue - # For 4th Intel on 3.11 + # For 4th Intel after 3.11 m = re.search( r'\(II\) (.*)\(\d+\): switch to mode .* using (.*),', line) if m: self.displays[display_name] = display - self.video_driver = m.group(1) + self.video_driver = 'intel' # 'intel' is what we expect to see display_name = m.group(2) display = {'Output': display_name} continue diff --git a/bin/memory_compare b/bin/memory_compare index 12a14ecd..c1450389 100755 --- a/bin/memory_compare +++ b/bin/memory_compare @@ -24,6 +24,7 @@ import os import sys +import re from math import log, copysign from subprocess import check_output, PIPE @@ -37,8 +38,13 @@ class LshwJsonResult: memory_reported = 0 banks_reported = 0 + # jlane LP:1525009 + # Discovered the case can change, my x86 systems used "System Memory" + # Failing ARM system used "System memory" + desc_regex = re.compile('System Memory', re.IGNORECASE) + def addHardware(self, hardware): - if hardware['id'] == 'memory': + if self.desc_regex.match(str(hardware.get('description',0))): self.memory_reported += int(hardware.get('size', 0)) elif 'bank' in hardware['id']: self.banks_reported += int(hardware.get('size', 0)) @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-11-28 04:35+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2015-12-15 05:08+0000\n" +"X-Generator: Launchpad (build 17865)\n" #. description #: ../jobs/audio.txt.in:8 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-11-28 04:35+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2015-12-15 05:08+0000\n" +"X-Generator: Launchpad (build 17865)\n" "Language: Polish\n" #. description diff --git a/po/zh_TW.po b/po/zh_TW.po index e440abd1..7b2c9edb 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-11-28 04:35+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2015-12-15 05:08+0000\n" +"X-Generator: Launchpad (build 17865)\n" #. description #: ../jobs/audio.txt.in:8 |