Merge lp:~jamesh/mediascanner/disable-tmdb into lp:mediascanner
Proposed by
James Henstridge
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Michal Hruby | ||||||||
Approved revision: | 395 | ||||||||
Merged at revision: | 396 | ||||||||
Proposed branch: | lp:~jamesh/mediascanner/disable-tmdb | ||||||||
Merge into: | lp:mediascanner | ||||||||
Diff against target: |
66 lines (+13/-14) 3 files modified
CMakeLists.txt (+12/-12) debian/rules (+0/-1) mediascanner.gschema.xml.in (+1/-1) |
||||||||
To merge this branch: | bzr merge lp:~jamesh/mediascanner/disable-tmdb | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jussi Pakkanen (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Don't error out if no TheMovieDB API key is provided. Instead disable the grl-tmdb metadata resolver.
Description of the change
Don't error out if no TheMovieDB API key is provided. Instead disable the grl-tmdb metadata resolver.
To post a comment you must log in.
PASSED: Continuous integration, rev:395 jenkins. qa.ubuntu. com/job/ mediascanner- ci/78/ jenkins. qa.ubuntu. com/job/ mediascanner- saucy-amd64- ci/78 jenkins. qa.ubuntu. com/job/ mediascanner- saucy-armhf- ci/78 jenkins. qa.ubuntu. com/job/ mediascanner- saucy-armhf- ci/78/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mediascanner- saucy-i386- ci/78
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: 10.97.0. 26:8080/ job/mediascanne r-ci/78/ rebuild
http://