Ubuntu system image

Merge lp://staging/~barry/ubuntu-system-image/citrain232 into lp://staging/~ubuntu-managed-branches/ubuntu-system-image/system-image

  1. citrain232
  2. Merge into system-image
Proposed by Barry Warsaw
Status: Merged
Approved by: Barry Warsaw
Approved revision: 237
Merged at revision: 235
Proposed branch: lp://staging/~barry/ubuntu-system-image/citrain232
Merge into: lp://staging/~ubuntu-managed-branches/ubuntu-system-image/system-image
Diff against target: 260 lines (+100/-22)
10 files modified
NEWS.rst (+6/-0)
PKG-INFO (+1/-1)
debian/changelog (+14/-0)
debian/control (+11/-10)
setup.cfg (+1/-1)
system_image.egg-info/PKG-INFO (+1/-1)
systemimage/settings.py (+28/-5)
systemimage/tests/test_config.py (+5/-2)
systemimage/tests/test_settings.py (+32/-1)
systemimage/version.txt (+1/-1)
To merge this branch: bzr merge lp://staging/~barry/ubuntu-system-image/citrain232
Reviewer Review Type Date Requested Status
Ubuntu CI managed package branches Pending
Review via email: mp+229149@code.staging.launchpad.net

Commit message

LP: #1349478

Description of the change

2.3.2 (2014-07-31)
==================
 * When system-image-{cli,dbus} is run as non-root, use a fallback location
   for the settings.db file, if the parent directory isn't writable.
   (LP: #1349478)

To post a comment you must log in.
lp://staging/~barry/ubuntu-system-image/citrain232 updated
236. By Barry Warsaw

* d/control:
  - Bump X-Python3-Version to (Python) 3.4.
  - Update run-time dependencies so that system-image-common now depends
    on python3-dbus and python3-xdg, while -dbus and -cli only need to
    depend on system-image-common.

237. By Barry Warsaw

bump version number for ppa happiness

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