Merge lp://staging/~gary-lasker/software-center/metadata-fixes into lp://staging/software-center

Proposed by Michael Vogt
Status: Merged
Merged at revision: 1154
Proposed branch: lp://staging/~gary-lasker/software-center/metadata-fixes
Merge into: lp://staging/software-center
Diff against target: 235 lines (+55/-32) (has conflicts)
9 files modified
apt-xapian-index-plugin/software-center.py (+3/-0)
debian/changelog (+23/-0)
softwarecenter/db/application.py (+5/-1)
softwarecenter/db/database.py (+4/-4)
softwarecenter/db/update.py (+2/-16)
softwarecenter/distro/Ubuntu.py (+4/-3)
softwarecenter/view/appdetailsview_gtk.py (+2/-0)
softwarecenter/view/appview.py (+8/-8)
test/test_database.py (+4/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://staging/~gary-lasker/software-center/metadata-fixes
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+35064@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

This
             index_name(document, name, self.indexer)
+ document.add_value(XAPIAN_VALUE_APPNAME, name)

should not be needed, index_name() is doing this already.

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

I removed that single line and now it appears to be fine

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

Eh, sorry. I mean "Now its fine and merged"

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