Merge lp:~therve/landscape-client/hal-soft-dep into lp:~landscape/landscape-client/trunk
Proposed by
Thomas Herve
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jamu Kakar | ||||
Approved revision: | 319 | ||||
Merged at revision: | 315 | ||||
Proposed branch: | lp:~therve/landscape-client/hal-soft-dep | ||||
Merge into: | lp:~landscape/landscape-client/trunk | ||||
Diff against target: |
243 lines (+91/-14) 8 files modified
debian/control (+2/-2) debian/landscape-client.init (+2/-2) debian/rules (+10/-4) landscape/monitor/hardwareinventory.py (+11/-2) landscape/monitor/mountinfo.py (+29/-2) landscape/monitor/tests/test_mountinfo.py (+30/-0) landscape/monitor/tests/test_service.py (+1/-0) landscape/service.py (+6/-2) |
||||
To merge this branch: | bzr merge lp:~therve/landscape-client/hal-soft-dep | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jamu Kakar (community) | Approve | ||
Free Ekanayaka (community) | Approve | ||
Review via email: mp+47992@code.launchpad.net |
Description of the change
The branch:
* Handles import error from Hal and Dbus
* Disable the hardware plugin when hal is not there
* Use gudev in the mount plugin when hal is not there
* Makes the packaging changes so that hal and python-dbus are suggested in natty, and depends on gudev instead.
To post a comment you must log in.
Looks good, though I didn't test it for real. +1!