Merge lp:~taihsiangho/checkbox-certification/lp1330934-workaround into lp:checkbox-certification

Proposed by Taihsiang Ho on 2014-12-25
Status: Merged
Approved by: Taihsiang Ho on 2014-12-25
Approved revision: 653
Merged at revision: 653
Proposed branch: lp:~taihsiangho/checkbox-certification/lp1330934-workaround
Merge into: lp:checkbox-certification
Diff against target: 18 lines (+3/-3)
1 file modified
bin/checkbox-certification-submit (+3/-3)
To merge this branch: bzr merge lp:~taihsiangho/checkbox-certification/lp1330934-workaround
Reviewer Review Type Date Requested Status
Taihsiang Ho Approve on 2014-12-25
Review via email:

Description of the change

a workaround of LP: #1330934

checkbox-certification-submit will be a wrapper once this MR is accepted:

To post a comment you must log in.
Taihsiang Ho (taihsiangho) wrote :

It's Christmas holidays and it is only a temporary workaround.
The potential risk of this fix is low as well.
So, self-approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/checkbox-certification-submit'
--- bin/checkbox-certification-submit 2014-01-10 11:07:29 +0000
+++ bin/checkbox-certification-submit 2014-12-25 06:22:14 +0000
@@ -93,11 +93,11 @@
93 if args.hwid:93 if args.hwid:
94 hardware_id = args.hwid94 hardware_id = args.hwid
95 elif not args.hwid:95 elif not args.hwid:
96 # Try to grok the hardware_id from checkbox-certification.ini96 # Try to grok the hardware_id from checkbox.conf
97 try:97 try:
98 sid_found = False98 sid_found = False
99 ini_file = "/etc/checkbox.d/checkbox-certification.ini"99 ini_file = "/etc/xdg/checkbox.conf"
100 ini_fh = open('/etc/checkbox.d/checkbox-certification.ini')100 ini_fh = open(ini_file)
101 for line in ini_fh:101 for line in ini_fh:
102 if 'secure_id' in line:102 if 'secure_id' in line:
103 sid_found = True103 sid_found = True


People subscribed via source and target branches