Merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/paths-1642225 into lp://qastaging/ubuntu-system-settings-online-accounts
Proposed by
Alberto Mardegan
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Marcus Tomlinson | ||||
| Approved revision: | 410 | ||||
| Merged at revision: | 407 | ||||
| Proposed branch: | lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/paths-1642225 | ||||
| Merge into: | lp://qastaging/ubuntu-system-settings-online-accounts | ||||
| Diff against target: |
337 lines (+33/-185) 9 files modified
online-accounts-service/utils.cpp (+14/-0) online-accounts-ui/dialog-request.cpp (+2/-1) online-accounts-ui/online-accounts-ui.pro (+0/-2) online-accounts-ui/panel-request.cpp (+0/-129) online-accounts-ui/panel-request.h (+0/-50) online-accounts-ui/provider-request.cpp (+3/-2) online-accounts-ui/request.cpp (+7/-1) online-accounts-ui/request.h (+2/-0) tests/online-accounts-ui/mock/request-mock.cpp (+5/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/paths-1642225 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marcus Tomlinson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Support running inside a snap
- If the $SNAP variable is set, prefix that to absolute paths
- If the client is running under the same confinement as our service (that is, it's in the same snap) treat it as unconfined.
Description of the change
Support running inside a snap
- If the $SNAP variable is set, prefix that to absolute paths
- If the client is running under the same confinement as our service (that is, it's in the same snap) treat it as unconfined.
To post a comment you must log in.
Revision history for this message
| Marcus Tomlinson (marcustomlinson) wrote | # |
Revision history for this message
| Alberto Mardegan (mardy) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good, will test this in a moment. One inline comment so long.