lp:~barry/ubuntu-system-image/citrain-2.2
- Get this branch:
- bzr branch lp:~barry/ubuntu-system-image/citrain-2.2
Branch merges
- Manuel de la Peña (community): Approve
- Ubuntu CI managed package branches: Pending requested
-
Diff: 1484 lines (+646/-221)33 files modifiedNEWS.rst (+22/-0)
PKG-INFO (+1/-1)
debian/changelog (+26/-0)
debian/patches/lp1284217.patch (+0/-106)
debian/patches/series (+0/-1)
debian/rules (+3/-0)
ini-manpage.rst (+6/-2)
setup.cfg (+1/-1)
system_image.egg-info/PKG-INFO (+1/-1)
system_image.egg-info/SOURCES.txt (+4/-0)
system_image.egg-info/entry_points.txt (+1/-1)
systemimage/api.py (+16/-3)
systemimage/bag.py (+9/-1)
systemimage/config.py (+54/-14)
systemimage/dbus.py (+29/-13)
systemimage/download.py (+13/-39)
systemimage/main.py (+6/-2)
systemimage/scores.py (+1/-1)
systemimage/state.py (+2/-10)
systemimage/testing/controller.py (+2/-1)
systemimage/testing/dbus.py (+0/-2)
systemimage/testing/helpers.py (+11/-0)
systemimage/tests/data/channel_02.ini (+3/-0)
systemimage/tests/data/config_05.ini (+36/-0)
systemimage/tests/data/config_06.ini (+36/-0)
systemimage/tests/data/config_07.ini (+36/-0)
systemimage/tests/data/config_08.ini (+36/-0)
systemimage/tests/test_api.py (+16/-2)
systemimage/tests/test_bag.py (+61/-0)
systemimage/tests/test_config.py (+56/-4)
systemimage/tests/test_dbus.py (+128/-14)
systemimage/tests/test_main.py (+29/-1)
systemimage/version.txt (+1/-1)
Related bugs
Bug #1250817: Exceptions in the state machine (D-Bus) should result in UpdateAvailableStatus with an error_reason | High | Fix Released | |
Bug #1278589: Support turning off https from channel.ini | Wishlist | Fix Released | |
Bug #1279532: Log dir path should be pass to udm to simplify debugging | Low | Fix Released | |
Bug #1283277: Fix shebang to be /usr/bin/python3 | High | Fix Released | |
Bug #1284217: [updates] Displays a spinner indefinitely when an update download was started externally | Critical | Fix Released | |
Bug #1287287: Remove atomic rename workaround in client | High | Fix Released | |
Bug #1287919: Race condition when manually downloading | Critical | Fix Released |
Related blueprints
Branch information
Recent revisions
- 232. By Barry Warsaw
-
- LP: #1284217 - When CheckForUpdate() is called a second time, while
an auto-download is in progress, but after the first check is
complete, we send an UpdateAvailableStatus signal with the cached
information.
- LP: #1287919 - Close a race condition when manually downloading and
issuing multiple CheckForUpdate calls.
- LP: #1278589 - Support disabling either HTTP or HTTPS services for
custom system image servers.
- Allow the channel.ini file to override the [service] section.
- LP: #1287287 - Do not do atomic renames of temporary download files;
ubuntu-download- manager now supports this by default.
- LP: #1250817 - Exceptions in the state machine are caught and
logged, with an appropriate error message added to
UpdateAvailableStatus signals. These exceptions do not percolate up
to the GLib main loop.
- LP: #1279532 - During testing, pass the log dir argument to
ubuntu-download- manager.
* d/rules: Add override_dh_python3 rule to set shebang line to
/usr/bin/python3. (LP: #1283277)
* d/patches/lp1284217. patch: Removed; applied upstream. - 231. By Barry Warsaw
-
bzr merge-upstream --version=2.2 ../client/
dist/system- image-2. 2.tar.gz ../client -r tag:2.2 - 229. By Barry Warsaw
-
New upstream release, along with some packaging changes. See changelog and NEWS.rst for details. Fixes: 1260768, 1277589, 1279056, 1284217
- 228. By Didier Roche-Tolomelli
-
Fix ApplyUpdate() to return an empty string as per spec if the update
is successfull (LP: #1260712)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~registry/ubuntu-system-image/client