Checkbox

Merge lp:~bladernr/checkbox/1048058-graphics_driver_exception into lp:checkbox

  1. 1048058-graphics_driver_exception
  2. Merge into trunk
Proposed by Jeff Lane 
Status: Merged
Merged at revision: 1656
Proposed branch: lp:~bladernr/checkbox/1048058-graphics_driver_exception
Merge into: lp:checkbox
Diff against target: 38 lines (+6/-4)
2 files modified
debian/changelog (+3/-1)
scripts/graphics_driver (+3/-3)
To merge this branch: bzr merge lp:~bladernr/checkbox/1048058-graphics_driver_exception
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+123769@code.launchpad.net

Description of the change

fixed the traceback caused when running on hybrid systems. Here is what the output looks like after the fix:

ubuntu@201202-10574:~/Desktop$ python3 graphics_driver
------------- VIDEO DRIVER INFORMATION -------------
Video Driver: intel
Driver Version: 2.15.901

------------- HYBRID GRAPHICS CHECK ----------------
Graphics Chipset: Intel (8086:0166)
Graphics Chipset: NVIDIA (10de:1058)
Loaded DDX Drivers: intel, vesa, fbdev, fbdevhw
Hybrid Graphics: yes

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Thanks for fixing this! merging...

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-09-11 14:31:57 +0000
3+++ debian/changelog 2012-09-11 14:52:27 +0000
4@@ -17,6 +17,8 @@
5 rather than just lsmod output (LP: #1043531)
6 * jobs/wireless.txt.in: Added jobs to individually test 802.11a/b/g/n
7 connections. This is necessary for adequate QA testing (LP: #1042425)
8+ * scripts/graphics_driver: fixed a bug causing the hybrid check to throw an
9+ exception on hybrid systems (LP: #1048058)
10
11 [Daniel Manrique]
12 * Bumped to 0.14.6 to keep changelog size sane and fix a small mishap in the
13@@ -86,7 +88,7 @@
14 [Zygmunt Krynicki]
15 * Fixed simple duplicate 'the' mistakes (LP: #1040022)
16
17- -- Daniel Manrique <roadmr@ubuntu.com> Sat, 08 Sep 2012 23:29:19 -0400
18+ -- Jeff Lane <jeff@ubuntu.com> Tue, 11 Sep 2012 10:34:34 -0400
19
20 checkbox (0.14.5) quantal; urgency=low
21
22
23=== modified file 'scripts/graphics_driver'
24--- scripts/graphics_driver 2012-09-10 03:44:43 +0000
25+++ scripts/graphics_driver 2012-09-11 14:52:27 +0000
26@@ -301,9 +301,9 @@
27 print('Loaded DDX Drivers: %s' %
28 ', '.join(drivers))
29
30- has_hybrid_graphics = (len(cards) > 1 and hybrid.is_laptop()
31- and (hybrid.cards_dict.get('8086') in formatted_cards
32- or hybrid.cards_dict.get('1002') in formatted_cards))
33+ has_hybrid_graphics = (len(cards) > 1 and is_laptop()
34+ and (cards_dict.get('8086') in formatted_cards
35+ or cards_dict.get('1002') in formatted_cards))
36
37 print('Hybrid Graphics: %s' % (has_hybrid_graphics
38 and 'yes' or 'no'))

Subscribers

People subscribed via source and target branches