Merge lp:~jamesh/archive-index/app-install into lp:~mvo/archive-index/app-install-mvo

Proposed by James Henstridge
Status: Needs review
Proposed branch: lp:~jamesh/archive-index/app-install
Merge into: lp:~mvo/archive-index/app-install-mvo
Diff against target: 10 lines (+1/-1)
1 file modified
src/ (+1/-1)
To merge this branch: bzr merge lp:~jamesh/archive-index/app-install
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Pending
Michael Vogt Pending
Review via email:

Commit message

Remove the /usr/share/scope prefix from scope files extracted from the archive.

Description of the change

When doing a full app-install data extraction, I found I'd forgotten to update the file name mangling for scope files extracted from the packages. This commit fixes that.

To post a comment you must log in.

Unmerged revisions

24. By James Henstridge

Strip off usr/share/unity/scopes prefix from extracted names.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/'
--- src/ 2012-02-13 17:00:11 +0000
+++ src/ 2013-04-25 04:34:29 +0000
@@ -180,5 +180,5 @@
181def _get_extract_name(package, extract_path):181def _get_extract_name(package, extract_path):
182 # returns names for desktop entries that are unlikely to cause collisions182 # returns names for desktop entries that are unlikely to cause collisions
183 rel_extract_path = re.sub("^usr/share/applications/", "", extract_path)183 rel_extract_path = re.sub("^usr/share/(applications|unity/scopes)/", "", extract_path)
184 return "{0}:{1}".format(package, rel_extract_path.replace("/", "__"))184 return "{0}:{1}".format(package, rel_extract_path.replace("/", "__"))


People subscribed via source and target branches

to all changes: