From fa6f70ac8a33b77e5f53ab564e8a0e3fbb2816da Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 5 May 2018 16:00:14 +0100
Subject: [PATCH] #413 manual retrigger of discovery does not work

---
 Changes                                    | 6 ++++++
 lib/App/Netdisco/Worker/Plugin/Discover.pm | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Changes b/Changes
index 45940c06..1b779f1e 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+2.039028 - 2018-05-05
+
+  [BUG FIXES]
+
+  * #413 manual retrigger of discovery does not work
+
 2.039027 - 2018-04-28
 
   [BUG FIXES]
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover.pm b/lib/App/Netdisco/Worker/Plugin/Discover.pm
index f3b48352..7c25daeb 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover.pm
@@ -21,7 +21,8 @@ register_worker({ phase => 'check' }, sub {
 
   # runner has already called get_device to promote $job->device
   return $job->cancel("fresh discover cancelled: $device already known")
-    if $device->in_storage and $job->subaction eq 'with-nodes';
+    if $device->in_storage
+       and ($job->subaction eq 'with-nodes' and not $job->username);
 
   return Status->defer("discover deferred: $device is not discoverable")
     unless is_discoverable_now($device);