Merge lp:~sylvain-pineau/checkbox/bug1089911 into lp:checkbox

Proposed by Sylvain Pineau
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 1853
Merged at revision: 1853
Proposed branch: lp:~sylvain-pineau/checkbox/bug1089911
Merge into: lp:checkbox
Diff against target: 28 lines (+6/-1)
2 files modified
debian/changelog (+2/-0)
scripts/network_device_info (+4/-1)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/bug1089911
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+139692@code.launchpad.net

Commit message

Set the driver version to 'Unknown' if the modinfo_parser returns nothing

Description of the change

Set the driver version to 'Unknown' if the modinfo_parser returns nothing in scripts/network_device_info

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-12-13 09:30:47 +0000
3+++ debian/changelog 2012-12-13 13:20:25 +0000
4@@ -44,6 +44,8 @@
5 containing a command line parameter.
6 * jobs/graphics.txt.in: Set the bash pipefail option for tests using
7 unity_support_test and piped to ansi_parser.
8+ * scripts/network_device_info: Set the driver version to 'Unknown' if the
9+ modinfo_parser returns nothing (LP: #1089911)
10
11 -- Daniel Manrique <roadmr@ubuntu.com> Fri, 16 Nov 2012 12:14:21 -0500
12
13
14=== modified file 'scripts/network_device_info'
15--- scripts/network_device_info 2012-08-30 16:00:12 +0000
16+++ scripts/network_device_info 2012-12-13 13:20:25 +0000
17@@ -71,7 +71,10 @@
18
19 if self._driver != "Unknown":
20 self._modinfo = self._modinfo_parser(props['Driver'])
21- self._driver_ver = self._find_driver_ver()
22+ if self._modinfo:
23+ self._driver_ver = self._find_driver_ver()
24+ else:
25+ self._driver_ver = "Unknown"
26
27 try:
28 self._firmware_missing = props['FirmwareMissing']

Subscribers

People subscribed via source and target branches