Merge lp://staging/~barry/ubuntu-system-image/citrain-24.0u1 into lp://staging/~ubuntu-managed-branches/ubuntu-system-image/system-image
| Status: | Superseded | ||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~barry/ubuntu-system-image/citrain-24.0u1 | ||||||||||||||||||||||||
| Merge into: | lp://staging/~ubuntu-managed-branches/ubuntu-system-image/system-image | ||||||||||||||||||||||||
| Diff against target: |
2706 lines (+1011/-217) 53 files modified
NEWS.rst (+18/-0) PKG-INFO (+1/-1) cli-manpage.rst (+2/-9) coverage.ini (+15/-0) debian/changelog (+27/-0) debian/control (+0/-1) debian/rules (+4/-15) debian/system-image-common.postinst (+2/-0) debian/system-image-common.postrm (+2/-0) ini-manpage.rst (+21/-6) setup.cfg (+2/-2) system_image.egg-info/PKG-INFO (+1/-1) system_image.egg-info/SOURCES.txt (+6/-0) systemimage/api.py (+1/-1) systemimage/bag.py (+1/-1) systemimage/bindings.py (+2/-2) systemimage/candidates.py (+1/-1) systemimage/channel.py (+1/-1) systemimage/config.py (+17/-4) systemimage/dbus.py (+77/-15) systemimage/device.py (+1/-1) systemimage/download.py (+6/-5) systemimage/gpg.py (+2/-2) systemimage/helpers.py (+25/-42) systemimage/image.py (+1/-1) systemimage/logging.py (+36/-34) systemimage/main.py (+15/-9) systemimage/reactor.py (+1/-1) systemimage/reboot.py (+1/-1) systemimage/scores.py (+1/-1) systemimage/service.py (+9/-7) systemimage/settings.py (+1/-1) systemimage/state.py (+6/-0) systemimage/testing/controller.py (+8/-4) systemimage/testing/dbus.py (+71/-1) systemimage/testing/helpers.py (+2/-1) systemimage/testing/nose.py (+11/-3) systemimage/testing/service.py (+50/-0) systemimage/tests/data/channel_06.ini (+8/-0) systemimage/tests/data/channel_07.ini (+8/-0) systemimage/tests/data/config_03.ini (+1/-1) systemimage/tests/data/config_09.ini (+27/-0) systemimage/tests/data/config_10.ini (+35/-0) systemimage/tests/test_api.py (+12/-0) systemimage/tests/test_config.py (+63/-2) systemimage/tests/test_dbus.py (+159/-10) systemimage/tests/test_download.py (+45/-18) systemimage/tests/test_helpers.py (+72/-4) systemimage/tests/test_main.py (+32/-2) systemimage/tests/test_state.py (+82/-2) systemimage/version.txt (+1/-1) tox.ini (+16/-2) unittest.cfg (+2/-1) |
||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~barry/ubuntu-system-image/citrain-24.0u1 | ||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu CI managed package branches | Pending | ||
|
Review via email:
|
|||
Description of the change
system-image (2.4-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release.
- LP: #1353178 - The channel.ini file can override the device name by
setting `[service]device`.
- LP: #1324241 - Add optional instrumentation to collect code coverage
data during test suite run via tox.
- LP: #1279970 - When an exception occurs in a `system-image-dbus`
D-Bus method, signal, or callback, this exception is logged in the
standard log file, and the process exits. Also, `[system]loglevel`
can now take an optional ":level" prefix which can be used to set
the log level for the D-Bus API methods. By default, they log at
`ERROR` level, but can be set lower for debugging purposes.
- LP: #1365646 - Don't crash when releasing an unacquired checking lock.
- LP: #1365761 - When checking files for `last_update_
Permissio
- LP: #1369714 - `system-image-cli --dbus` has been deprecated and
will be removed in the future.
* d/control: Remove tox as a build dependency to avoid having to MIR tox,
virtualenv, and pip.
* d/rules:
- Call nose2 explicitly to avoid use of tox.
- Remove unnecessary override_
* d/system-
-- Barry Warsaw <email address hidden> Tue, 09 Sep 2014 11:05:09 -0400
