Merge lp://qastaging/~michihenning/thumbnailer/snap into lp://qastaging/thumbnailer/devel
Proposed by
Michi Henning
Status: | Merged |
---|---|
Approved by: | James Henstridge |
Approved revision: | 377 |
Merged at revision: | 370 |
Proposed branch: | lp://qastaging/~michihenning/thumbnailer/snap |
Merge into: | lp://qastaging/thumbnailer/devel |
Diff against target: |
833 lines (+228/-124) 25 files modified
CMakeLists.txt (+5/-0) doc/libthumbnailer-qt/examples/qt_example_test.cpp (+3/-3) include/internal/env_vars.h (+22/-6) man/thumbnailer-service.1 (+1/-1) snapcraft.yaml (+4/-0) src/CMakeLists.txt (+1/-0) src/env_vars.cpp (+148/-0) src/file_io.cpp (+1/-1) src/imageextractor.cpp (+1/-4) src/service/inactivityhandler.cpp (+1/-39) src/settings.cpp (+2/-19) src/thumbnailer.cpp (+2/-2) src/ubuntuserverdownloader.cpp (+2/-13) tests/dbus/dbus_test.cpp (+7/-7) tests/download/download_test.cpp (+1/-1) tests/file_io/file_io_test.cpp (+1/-1) tests/image-provider/image-provider_test.cpp (+1/-2) tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp (+3/-3) tests/qml/qml_test.cpp (+1/-1) tests/settings/settings_test.cpp (+3/-3) tests/slow-vs-thumb/slow-vs-thumb_test.cpp (+1/-1) tests/stress/stress_test.cpp (+4/-4) tests/thumbnailer-admin/thumbnailer-admin_test.cpp (+3/-3) tests/thumbnailer/thumbnailer_test.cpp (+8/-8) tests/utils/artserver.cpp (+2/-2) |
To merge this branch: | bzr merge lp://qastaging/~michihenning/thumbnailer/snap |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Henstridge | Approve | ||
unity-api-1-bot | continuous-integration | Approve | |
Review via email:
|
Commit message
Adjust paths when running in a snap. Decision whether to adjust paths is now made at compile time. Also consolidated all the environment variable accesses into an EnvVar helper class.
Added home interface to service and admin tool for the time being. This allows local thumbnailing to work (but the apparmor credentials check is currently not doing the right thing).
videos don't thumbnail yet because we are not bundling the gstreamer codecs, I suspect.
Description of the change
Adjust paths when running in a snap.
To post a comment you must log in.
PASSED: Continuous integration, rev:373 /jenkins. canonical. com/unity- api-1/job/ lp-thumbnailer- ci/22/ /jenkins. canonical. com/unity- api-1/job/ build/1577 /jenkins. canonical. com/unity- api-1/job/ build-0- fetch/1584 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1362 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1362/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= zesty/1362 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= zesty/1362/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1362 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1362/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= zesty/1362 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= zesty/1362/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1362 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1362/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= zesty/1362 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= zesty/1362/ artifact/ output/ *zip*/output. zip
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: /jenkins. canonical. com/unity- api-1/job/ lp-thumbnailer- ci/22/rebuild
https:/