biometryd

Merge lp://staging/~thomas-voss/biometryd/also-consider-vendor-when-scanning-for-backends into lp://staging/biometryd

  1. also-consider-vendor-when-scanning-for-backends
  2. Merge into trunk
Proposed by Thomas Voß
Status: Merged
Approved by: Ken VanDine
Approved revision: 32
Merged at revision: 33
Proposed branch: lp://staging/~thomas-voss/biometryd/also-consider-vendor-when-scanning-for-backends
Merge into: lp://staging/biometryd
Prerequisite: lp://staging/~thomas-voss/biometryd/add-configuration-oracle
Diff against target: 294 lines (+85/-49)
10 files modified
CMakeLists.txt (+4/-0)
src/biometry/cmds/config.cpp (+10/-2)
src/biometry/cmds/config.h (+2/-1)
src/biometry/daemon.cpp (+1/-1)
src/biometry/daemon.h (+10/-2)
src/biometry/daemon_configuration.cpp.in (+10/-0)
src/biometry/devices/plugin/enumerator.cpp (+41/-37)
src/biometry/devices/plugin/enumerator.h (+3/-2)
tests/test_device_registrar.cpp (+3/-3)
tests/test_plugin_device.cpp (+1/-1)
To merge this branch: bzr merge lp://staging/~thomas-voss/biometryd/also-consider-vendor-when-scanning-for-backends
Reviewer Review Type Date Requested Status
Simon Fels Approve
Review via email: mp+297988@code.staging.launchpad.net

Commit message

Also consider /custom/vendor/biometryd/plugins when scanning for plugins.

Description of the change

Also consider /custom/vendor/biometryd/plugins when scanning for plugins.

To post a comment you must log in.
lp://staging/~thomas-voss/biometryd/also-consider-vendor-when-scanning-for-backends updated
31. By Thomas Voß

Add missing break on switch for cmds::Config::Flag.

32. By Thomas Voß

Make sure that we consider all configured plugin directories instead of returning early.

Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches