Merge lp://staging/~brendan-donegan/checkbox/plainbox_checkbox_option_and_remove_deb2 into lp://staging/checkbox
| Status: | Merged |
|---|---|
| Approved by: | Zygmunt Krynicki |
| Approved revision: | 2166 |
| Merged at revision: | 2166 |
| Proposed branch: | lp://staging/~brendan-donegan/checkbox/plainbox_checkbox_option_and_remove_deb2 |
| Merge into: | lp://staging/checkbox |
| Diff against target: |
120 lines (+36/-17) 3 files modified
plainbox/plainbox/impl/box.py (+26/-6) plainbox/plainbox/impl/checkbox.py (+2/-8) plainbox/plainbox/impl/test_box.py (+8/-3) |
| To merge this branch: | bzr merge lp://staging/~brendan-donegan/checkbox/plainbox_checkbox_option_and_remove_deb2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zygmunt Krynicki (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
box.py - add --checkbox option which allows us to specify where the installation of Checkbox we want to use is. Options are as specified in checkbox.py - currently src and deb
checkbox.py - remove deb2 as a directory mapping, since due to the existence of a link between /usr/lib/
test_box.py - reflect the changes to the help output caused by adding the --checkbox option
Note that in box.py because we need to know the Checkbox mode when creating CheckBox, but at the same time need the instance of CheckBox to parse the whole command line, we need to do a bit of hacking to parse just the --checkbox option alone, use it to create CheckBox with the desired mode and then parse everything else.
Adding argcomplete to the mode parser makes argcomplete broken, please remove that.