Merge lp:~michihenning/thumbnailer/remove-set-snap-env into lp:thumbnailer/devel

Proposed by Michi Henning on 2017-02-14
Status: Merged
Approved by: Michi Henning on 2017-02-15
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
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve on 2017-02-15
Michi Henning (community) Approve on 2017-02-15
James Henstridge 2017-02-14 Approve on 2017-02-15
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.

To post a comment you must log in.
Michi Henning (michihenning) wrote :

All red MR! :-)

unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:373
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/32/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1675/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1682
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1457
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1457/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1457
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1457/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1457
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1457/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1457/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1457
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1457/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1457/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/32/rebuild

review: Needs Fixing (continuous-integration)
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:373
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/33/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1676/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1683
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1458
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1458/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1458
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1458/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1458
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1458/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1458/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1458
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1458/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1458/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/33/rebuild

review: Needs Fixing (continuous-integration)
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:373
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/34/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1677/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1684
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1459
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1459/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1459
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1459/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1459
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1459/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1459/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1459
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1459/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1459/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/34/rebuild

review: Needs Fixing (continuous-integration)
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:373
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/35/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1678/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1685
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1460
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1460/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1460
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1460/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1460
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1460/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1460/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1460
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1460/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1460/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/35/rebuild

review: Needs Fixing (continuous-integration)
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:373
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/36/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1682
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1689
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1464
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1464/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1464
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1464/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1464
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1464/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1464
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1464/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1464
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1464/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1464
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1464/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/36/rebuild

review: Approve (continuous-integration)
James Henstridge (jamesh) wrote :

Looks good.

review: Approve
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-autoland/157/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1683/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1690
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1465
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1465/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1465
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1465/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1465
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1465/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1465/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1465
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1465/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1465
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1465/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)
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://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-autoland/158/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1684
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1691
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1466
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1466/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1466
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1466/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1466
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1466/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1466
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1466/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1466
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1466/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1466
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1466/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Michi Henning (michihenning) wrote :

Re-approving after Jenkins hit a problem with the archives.

review: Approve
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-autoland/160/
Executed test runs:

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)
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://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-autoland/159/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1685
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1692
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1467
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1467/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1467
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1467/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1467
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1467/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1467
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1467/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1467
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1467/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1467
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1467/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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)

Subscribers

People subscribed via source and target branches

to all changes: