unity-scopes-api

Merge lp:~stolowski/unity-scopes-api/apport-savilerow into lp:unity-scopes-api

  1. apport-savilerow
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Merged
Approved by: Michi Henning
Approved revision: 305
Merged at revision: 316
Proposed branch: lp:~stolowski/unity-scopes-api/apport-savilerow
Merge into: lp:unity-scopes-api
Diff against target: 34 lines (+10/-6)
1 file modified
data/libunity-scopes.py (+10/-6)
To merge this branch: bzr merge lp:~stolowski/unity-scopes-api/apport-savilerow
Reviewer Review Type Date Requested Status
Michi Henning (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+249658@code.launchpad.net

Commit message

Set CrashDB attribute to point at savilerow project for click scopes which has 'Canonical' as the maintainer.

Description of the change

Set CrashDB attribute to point at savilerow project for click scopes which has 'Canonical' as the maintainer.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:305
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/575/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/100
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/101

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/575/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Looks right to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/libunity-scopes.py'
2--- data/libunity-scopes.py 2015-02-04 09:47:38 +0000
3+++ data/libunity-scopes.py 2015-02-13 14:43:50 +0000
4@@ -29,7 +29,7 @@
5 from apport.packaging_impl import impl as packaging
6
7 # map 'name' from click package manifest to LP project (if known)
8-click_name_to_src = {
9+click_name_to_lp = {
10 'com.ubuntu.scopes.youtube': 'unity-scope-youtube',
11 'com.ubuntu.scopes.vimeo': 'unity-scope-vimeo',
12 'com.ubuntu.scopes.soundcloud': 'unity-scope-soundcloud'
13@@ -59,13 +59,17 @@
14 # get click manifest of a click package that owns this inifile
15 click_info = subprocess.check_output(['click', 'info', inifile], universal_newlines=True)
16 manifest = json.loads(click_info)
17- report['Package'] = '%s %s' % (manifest['name'], manifest['version'])
18 name = manifest['name']
19- if name in click_name_to_src:
20- report['SourcePackage'] = click_name_to_src[name]
21- else:
22- report['SourcePackage'] = name
23+ report['Package'] = '%s %s' % (name, manifest['version'])
24+ report['SourcePackage'] = name
25 report['PackageArchitecture'] = manifest['architecture']
26+ lp_project = None
27+ if name in click_name_to_lp:
28+ lp_project = click_name_to_lp[name]
29+ elif 'Canonical Content Partners' in manifest['maintainer'] and 'canonical' in name:
30+ lp_project = 'savilerow'
31+ if lp_project:
32+ report['CrashDB'] = '{"impl": "launchpad", "project": "' + lp_project + '", "bug_pattern_url": "http://people.canonical.com/~ubuntu-archive/bugpatterns/bugpatterns.xml"}'
33 except:
34 pass
35

Subscribers

People subscribed via source and target branches

to all changes: