Merge lp://staging/~mvo/software-center/fix-lp1019581 into lp://staging/software-center

Proposed by Michael Vogt
Status: Merged
Merged at revision: 3055
Proposed branch: lp://staging/~mvo/software-center/fix-lp1019581
Merge into: lp://staging/software-center
Diff against target: 173 lines (+65/-10)
7 files modified
apt_xapian_index_plugin/software_center.py (+6/-2)
data/ui/gtk3/SoftwareCenter.ui (+1/-0)
debian/changelog (+6/-0)
setup.py (+1/-1)
softwarecenter/db/update.py (+1/-2)
softwarecenter/version.py (+4/-4)
tests/test_xapian.py (+46/-1)
To merge this branch: bzr merge lp://staging/~mvo/software-center/fix-lp1019581
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+113001@code.staging.launchpad.net

Description of the change

This fixes a failure in the apt-xapian-index softwarecenter plugin and adds a test to ensure we do not get caught by this again.

To post a comment you must log in.
3057. By Michael Vogt

add changelog and remove unneeded commits

Revision history for this message
Michael Vogt (mvo) wrote :

There is a bit of noise in there (version.py, SoftwareCenter.ui) because python setup.py build was run
and that updates this data automatically.

Revision history for this message
Michael Vogt (mvo) wrote :

Self approving to unblock the distro

review: Approve

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