Ubuntu system image

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

  1. citrain302
  2. Merge into system-image
Proposed by Barry Warsaw
Status: Merged
Approved by: Barry Warsaw
Approved revision: 245
Merged at revision: 244
Proposed branch: lp://staging/~barry/ubuntu-system-image/citrain302
Merge into: lp://staging/~ubuntu-managed-branches/ubuntu-system-image/system-image
Diff against target: 395 lines (+147/-18)
14 files modified
NEWS.rst (+5/-0)
PKG-INFO (+1/-1)
debian/changelog (+11/-0)
debian/rules (+3/-0)
setup.cfg (+1/-1)
system_image.egg-info/PKG-INFO (+1/-1)
system_image.egg-info/SOURCES.txt (+1/-0)
system_image.egg-info/pbr.json (+1/-0)
systemimage/helpers.py (+12/-6)
systemimage/logging.py (+10/-6)
systemimage/testing/dbus.py (+28/-0)
systemimage/tests/test_dbus.py (+26/-2)
systemimage/tests/test_helpers.py (+46/-0)
systemimage/version.txt (+1/-1)
To merge this branch: bzr merge lp://staging/~barry/ubuntu-system-image/citrain302
Reviewer Review Type Date Requested Status
Barry Warsaw Pending
Review via email: mp+272481@code.staging.launchpad.net

Commit message

Don't crash when one of the .ini files is a dangling symlink. (LP: #1495688)

Description of the change

3.0.2 (2015-09-22)
==================
 * Don't crash when one of the .ini files is a dangling symlink.
   (LP: #1495688)

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

d/rules: override_dh_auto_clean because otherwise, pybuild will
remove the .egg-info files and that causes the Jenkins job in the CI
train to fail.

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