ubuntu-system-settings

Merge lp:~seb128/ubuntu-system-settings/location-desktop-usr into lp:ubuntu-system-settings

  1. location-desktop-usr
  2. Merge into trunk
Proposed by Sebastien Bacher on 2015-09-29
Status: Merged
Approved by: Ken VanDine on 2015-10-01
Approved revision: 1539
Merged at revision: 1542
Proposed branch: lp:~seb128/ubuntu-system-settings/location-desktop-usr
Merge into: lp:ubuntu-system-settings
Diff against target: 16 lines (+6/-0)
1 file modified
plugins/security-privacy/trust-store-model.cpp (+6/-0)
To merge this branch: bzr merge lp:~seb128/ubuntu-system-settings/location-desktop-usr
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-10-01
Olivier Tilloy (community) Approve on 2015-10-01
Paweł Stołowski (community) Approve on 2015-09-29
Ubuntu Touch System Settings 2015-09-29 Pending
Review via email: mp+272711@code.launchpad.net

Commit Message

[security-privacy] use the system location as well to look for trust store
items, that's needed at least for unity8-dash which is not
distributed as a click and doesn't a .local entry

Description of the Change

[security-privacy] use the system location as well to look for trust store
items, that's needed at least for unity8-dash which is not
distributed as a click and doesn't a .local entry

To post a comment you must log in.
Paweł Stołowski (stolowski) wrote :

Doesn't compile, you need to declare usrDesktopFilename.

review: Needs Fixing
lp:~seb128/ubuntu-system-settings/location-desktop-usr updated on 2015-09-29
1539. By Sebastien Bacher on 2015-09-29

correctly define the variable

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Paweł Stołowski (stolowski) wrote :

Yeah, works and looks fine. +1

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1539
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2417/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/192
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/601
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3587
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4405
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4405/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23755

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2417/rebuild

review: Needs Fixing (continuous-integration)
Olivier Tilloy (osomon) wrote :

And bonus points for fixing bug #1501428.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1539
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2421/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/605
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4446
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4446/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23837

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2421/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/security-privacy/trust-store-model.cpp'
2--- plugins/security-privacy/trust-store-model.cpp 2015-03-16 13:51:36 +0000
3+++ plugins/security-privacy/trust-store-model.cpp 2015-09-29 11:40:07 +0000
4@@ -102,6 +102,12 @@
5 }
6 }
7
8+ /* try system location as well, that's at least needed for unity8-dash
9+ * which is not a click (yet) and doesn't have a .local entry */
10+ QString usrDesktopFilename(QString("/usr/share/applications/%1.desktop").arg(id));
11+ if (QFile(usrDesktopFilename).exists())
12+ return usrDesktopFilename;
13+
14 qWarning() << "No desktop file found for app id: " << id;
15 return QString();
16 }

Subscribers

People subscribed via source and target branches