Merge lp:~michihenning/thumbnailer/remove-set-snap-env into lp:thumbnailer/devel
- remove-set-snap-env
- Merge into devel
Status: | Merged |
---|---|
Approved by: | Michi Henning |
Approved revision: | 373 |
Merged at revision: | 373 |
Proposed branch: | lp:~michihenning/thumbnailer/remove-set-snap-env |
Merge into: | lp:thumbnailer/devel |
Diff against target: |
61 lines (+0/-29) 3 files modified
include/internal/env_vars.h (+0/-2) src/env_vars.cpp (+0/-23) src/vs-thumb/vs-thumb.cpp (+0/-4) |
To merge this branch: | bzr merge lp:~michihenning/thumbnailer/remove-set-snap-env |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
unity-api-1-bot | continuous-integration | Approve | |
Michi Henning (community) | Approve | ||
James Henstridge | Approve | ||
Review via email: mp+317169@code.launchpad.net |
Commit message
Removed set_snap_env() again because desktop-launch now sets GST_PLUGIN_PATH.
Description of the change
Removed set_snap_env() again because desktop-launch now sets GST_PLUGIN_PATH.
Michi Henning (michihenning) wrote : | # |
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:373
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:373
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:373
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:373
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
unity-api-1-bot (unity-api-1-bot) wrote : | # |
PASSED: Continuous integration, rev:373
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
unity-api-1-bot (unity-api-1-bot) : | # |
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Michi Henning (michihenning) wrote : | # |
Re-approving after Jenkins hit a problem with the archives.
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
https:/
Executed test runs:
unity-api-1-bot (unity-api-1-bot) : | # |
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
unity-api-1-bot (unity-api-1-bot) : | # |
Preview Diff
1 | === modified file 'include/internal/env_vars.h' |
2 | --- include/internal/env_vars.h 2017-02-03 08:23:48 +0000 |
3 | +++ include/internal/env_vars.h 2017-02-14 07:52:29 +0000 |
4 | @@ -33,8 +33,6 @@ |
5 | |
6 | struct EnvVars |
7 | { |
8 | - static void set_snap_env(); |
9 | - |
10 | static int get_max_idle(); |
11 | static QString get_ubuntu_server_url(); |
12 | static QString get_util_dir(); |
13 | |
14 | === modified file 'src/env_vars.cpp' |
15 | --- src/env_vars.cpp 2017-02-08 01:30:32 +0000 |
16 | +++ src/env_vars.cpp 2017-02-14 07:52:29 +0000 |
17 | @@ -38,29 +38,6 @@ |
18 | namespace internal |
19 | { |
20 | |
21 | -void EnvVars::set_snap_env() |
22 | -{ |
23 | -#ifdef SNAP_BUILD |
24 | - char const* snap = getenv("SNAP"); |
25 | - if (snap) |
26 | - { |
27 | - char const* arch = getenv("SNAP_LAUNCHER_ARCH_TRIPLET"); |
28 | - if (!arch || !*arch) |
29 | - { |
30 | - throw runtime_error("Env var SNAP_LAUNCHER_ARCH_TRIPLET not set"); |
31 | - } |
32 | - |
33 | - string plugin_path = string(snap) + "/usr/lib/" + arch + "/gstreamer-1.0"; |
34 | - char const* old_plugin_path = getenv("GST_PLUGIN_PATH"); |
35 | - if (old_plugin_path && *old_plugin_path) |
36 | - { |
37 | - plugin_path += string(":") + old_plugin_path; |
38 | - } |
39 | - setenv("GST_PLUGIN_PATH", plugin_path.c_str(), 1); |
40 | - } |
41 | -#endif |
42 | -} |
43 | - |
44 | int EnvVars::get_max_idle() |
45 | { |
46 | char const* c_idle_time = getenv(MAX_IDLE); |
47 | |
48 | === modified file 'src/vs-thumb/vs-thumb.cpp' |
49 | --- src/vs-thumb/vs-thumb.cpp 2017-02-08 07:28:22 +0000 |
50 | +++ src/vs-thumb/vs-thumb.cpp 2017-02-14 07:52:29 +0000 |
51 | @@ -62,10 +62,6 @@ |
52 | { |
53 | TraceMessageHandler message_handler(progname); |
54 | |
55 | - // TODO: set_snap_env() sets GST_PLUGIN_PATH. It would be nice if |
56 | - // desktop-launch did this. Once it does, we can remove this again. |
57 | - EnvVars::set_snap_env(); // Must be called before gst_init(). |
58 | - |
59 | gst_init(&argc, &argv); |
60 | |
61 | if (argc != 3) |
All red MR! :-)