Merge lp://qastaging/~barry/ubuntu-system-image/systemimage2.3 into lp://qastaging/~registry/ubuntu-system-image/client

Proposed by Barry Warsaw
Status: Superseded
Proposed branch: lp://qastaging/~barry/ubuntu-system-image/systemimage2.3
Merge into: lp://qastaging/~registry/ubuntu-system-image/client
Diff against target: 4058 lines (+3524/-347) (has conflicts)
35 files modified
.bzrignore (+0/-10)
PKG-INFO (+10/-0)
README.rst (+71/-0)
debian/archive-master.tar.xz.asc (+17/-0)
debian/changelog (+468/-0)
debian/compat (+1/-0)
debian/control (+62/-0)
debian/copyright (+35/-0)
debian/rules (+64/-0)
debian/source/format (+1/-0)
debian/source/include-binaries (+1/-0)
debian/system-image-common.dirs (+2/-0)
debian/system-image-common.manpages (+3/-0)
debian/system-image-common.postinst (+23/-0)
debian/system-image-common.postrm (+18/-0)
debian/tests/client.ini.in (+34/-0)
debian/tests/control (+7/-0)
debian/tests/dryrun (+11/-0)
debian/tests/prep.py (+22/-0)
debian/tests/smoketest (+13/-0)
debian/tests/unittests (+11/-0)
debian/upstream/signing-key.asc (+2459/-0)
debian/watch (+2/-0)
setup.cfg (+9/-3)
system_image.egg-info/PKG-INFO (+10/-0)
system_image.egg-info/SOURCES.txt (+141/-0)
system_image.egg-info/dependency_links.txt (+1/-0)
system_image.egg-info/entry_points.txt (+4/-0)
system_image.egg-info/requires.txt (+1/-0)
system_image.egg-info/top_level.txt (+1/-0)
systemimage/docs/Makefile (+0/-153)
systemimage/tests/data/index_25.json (+22/-0)
tools/heregpg (+0/-7)
tools/mkvenv.py (+0/-121)
tools/sd.py (+0/-53)
Conflict adding file README.rst.  Moved existing file to README.rst.moved.
Conflict adding file systemimage/tests/data/index_25.json.  Moved existing file to systemimage/tests/data/index_25.json.moved.
To merge this branch: bzr merge lp://qastaging/~barry/ubuntu-system-image/systemimage2.3
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+227365@code.qastaging.launchpad.net
To post a comment you must log in.

Unmerged revisions

237. By Barry Warsaw

* d/rules:
  - Updated, and add --buildsystem=pybuild.
  - Fix 'nocheck' test short-circuiting.
* d/tests:
  - control: Update dependencies and restrictions.
  - dryrun: New schroot-compatible limited test suite. The existing
    smoketest test requires isolation-container so isn't compatible with
    schroot.

236. By Barry Warsaw

* d/watch, d/upstream/signing-key.asc: Added Barry's GPG signing key so
* d/control: Updated Build-Depends.
* d/rules: Updated, and add --buildsystem=pybuild.

235. By Barry Warsaw

* New upstream release.
  - LP: #1207860 - Support factory resets. system-image-cli
    --factory-reset and a new D-Bus API method FactoryReset() are added.
  - LP: #1262256 - Data file checksums are passed to
    ubuntu-download-manager where available.
  - LP: #1286542 - Certain duplicate destinations are allowed, if they
    have matching source urls and checksums.
  - LP: #1301995 - When system-image-{cli,dbus} is run as non-root, use
    a fallback location for the log file if the system log file isn't
    writable.
  - LP: #1251291 - system-image-cli --list-channels lists all the
    available channels, including aliases.
  - LP: #1279028 - system-image-cli --no-reboot downloads all files and
    prepares for recovery, but does not actually issue a reboot.
  - LP: #1249347 - system-image-cli --switch <channel> is a convenient
    alias for system-image-cli -b 0 -c <channel>.
  - LP: #1294273 - Added --show-settings, --get, --set, and --del
    options for viewing, changing, and setting all the internal database
    settings.
  - LP: #1271684 - Improve memory usage when verifying file checksums.
    Given by Michael Vogt.
  - LP: #1274131 - In the UpdatePaused signal, return a percentage value
    that's closer to reality than hardcoding it to 0.
  - LP: #1280169 - New D-Bus API method .Information() which is like
    .Info() except that it returns extended information details, as a
    mapping of strings to strings. These details include a
    last_check_date which is the ISO 8601 timestamp of the last time an
    UpdateAvailableStatus signal was sent.
  - LP: #1339157 - Set the GSM flag in ubuntu-download-manager based on
    the current s-i download setting.
  - LP: #1340882 - The system-image-dbus(8) manpage now describes the
    full D-Bus API.
  - LP: #1273354 - Fix the D-Bus mock service so that the downloading
    flag for UpdateAvailableStatus will correctly return true when
    checking twice under manual downloads.
  - LP: #1342183 - Pay down some tech-debt.
* d/watch, d/upstream/signing-key.asc: Add Barry's GPG signing key so
  that uscan will verify the signature of the download.

234. By Barry Warsaw

Add my GPG signing key.

233. By Barry Warsaw

Add pgpsigurlmangle to d/watch.

232. By PS Jenkins bot

Releasing 2.2-0ubuntu1

231. By Barry Warsaw

system-image (2.2-0ubuntu1) UNRELEASED; urgency=medium

  * New upstream release.
    - 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.

 -- Barry Warsaw <email address hidden> Wed, 05 Mar 2014 16:29:13 -0500
 Fixes: 1250817, 1278589, 1279532, 1283277, 1284217, 1287287, 1287919

230. By PS Jenkins bot

Releasing 2.1-0ubuntu4

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches