Merge lp://staging/~brendan-donegan/checkbox/bug1067280 into lp://staging/checkbox
Proposed by
Brendan Donegan
| Status: | Merged |
|---|---|
| Merged at revision: | 1778 |
| Proposed branch: | lp://staging/~brendan-donegan/checkbox/bug1067280 |
| Merge into: | lp://staging/checkbox |
| Diff against target: |
198 lines (+22/-19) 5 files modified
checkbox/lib/template.py (+1/-1) debian/changelog (+3/-0) jobs/resource.txt.in (+1/-1) jobs/suspend.txt.in (+9/-9) jobs/wireless.txt.in (+8/-8) |
| To merge this branch: | bzr merge lp://staging/~brendan-donegan/checkbox/bug1067280 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Manrique (community) | Approve | ||
| Marc Tardif (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix bug 1067280 by not trying to coerce keys of resource jobs to
lowercase
Description of the change
Stop Checkbox from trying to coerce resource job field names to lowercase as it was confusing itself in the case where the environment resource generated two fields called no_proxy (one for the 'NO_PROXY' variable and one for the 'no_proxy') variable. Consequently, use the uppercase version in the job files too.
Hopefully this matches the agreed approach.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good to me and I appreciate how converting to upper in the environment_info wasn't touched, that's perfect! This is a delicate change though, so I'd appreciate if someone else could give their thumbs up before merging. Thanks!