checkbox-certification

Merge lp:~tai271828/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:~tai271828/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:~tai271828/checkbox-certification/lp1330934-workaround
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Taihsiang Ho			Approve on 2014-12-25
Review via email: mp+245364@code.launchpad.net

a workaround of LP: #1330934

Revision history for this message

Taihsiang Ho (tai271828) wrote on 2014-12-25:

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

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'bin/checkbox-certification-submit'
2	--- bin/checkbox-certification-submit 2014-01-10 11:07:29 +0000
3	+++ bin/checkbox-certification-submit 2014-12-25 06:22:14 +0000
4	@@ -93,11 +93,11 @@
5	if args.hwid:
6	hardware_id = args.hwid
7	elif not args.hwid:
8	- # Try to grok the hardware_id from checkbox-certification.ini
9	+ # Try to grok the hardware_id from checkbox.conf
10	try:
11	sid_found = False
12	- ini_file = "/etc/checkbox.d/checkbox-certification.ini"
13	- ini_fh = open('/etc/checkbox.d/checkbox-certification.ini')
14	+ ini_file = "/etc/xdg/checkbox.conf"
15	+ ini_fh = open(ini_file)
16	for line in ini_fh:
17	if 'secure_id' in line:
18	sid_found = True