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

[James Henstridge]

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

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.

Unmerged revisions

24. By James Henstridge on 2013-04-24

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

=== modified file 'src/AppMetadata.py'
--- src/AppMetadata.py	2012-02-13 17:00:11 +0000
+++ src/AppMetadata.py	2013-04-25 04:34:29 +0000
@@ -180,5 +180,5 @@
 
 def _get_extract_name(package, extract_path):
     # returns names for desktop entries that are unlikely to cause collisions
-    rel_extract_path = re.sub("^usr/share/applications/", "", extract_path)
+    rel_extract_path = re.sub("^usr/share/(applications|unity/scopes)/", "", extract_path)
     return "{0}:{1}".format(package, rel_extract_path.replace("/", "__"))