From ed234bd2dc34c05e0bd1a775eed35a56534eb4df Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Mon, 3 Dec 2012 21:09:25 +0000
Subject: [PATCH] fix dancer import issues

---
 Netdisco/bin/netdisco-daemon         | 5 +----
 Netdisco/lib/Netdisco/PortControl.pm | 3 ---
 Netdisco/lib/Netdisco/Util.pm        | 7 +++++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Netdisco/bin/netdisco-daemon b/Netdisco/bin/netdisco-daemon
index 254178eb..73210591 100755
--- a/Netdisco/bin/netdisco-daemon
+++ b/Netdisco/bin/netdisco-daemon
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 
-use Dancer ':script';
+use Dancer ':syntax :script';
 use Dancer::Plugin::DBIC 'schema';
 
 # add dispatch methods for each port control action
@@ -29,9 +29,6 @@ sub gd_preconfig {
     sleep_time => 5,
   };
 
-  # store for later access
-  var(nd_config => $config);
-
   return (); # important
 }
 
diff --git a/Netdisco/lib/Netdisco/PortControl.pm b/Netdisco/lib/Netdisco/PortControl.pm
index b7d19e01..bacc55b1 100644
--- a/Netdisco/lib/Netdisco/PortControl.pm
+++ b/Netdisco/lib/Netdisco/PortControl.pm
@@ -1,8 +1,5 @@
 package Netdisco::PortControl;
 
-use strict;
-use warnings FATAL => 'all';
-
 use Netdisco::Util ':port_control';
 use Try::Tiny;
 
diff --git a/Netdisco/lib/Netdisco/Util.pm b/Netdisco/lib/Netdisco/Util.pm
index d5a7d9b8..0f9fed21 100644
--- a/Netdisco/lib/Netdisco/Util.pm
+++ b/Netdisco/lib/Netdisco/Util.pm
@@ -1,7 +1,7 @@
 package Netdisco::Util;
 
-use strict;
-use warnings FATAL => 'all';
+use Dancer qw/:syntax :script/;
+use Dancer::Plugin::DBIC 'schema';
 
 use SNMP::Info;
 use Config::Tiny;
@@ -27,6 +27,9 @@ sub load_nd_config {
       die (Config::Tiny->errstr ."\n") if !defined $config;
   }
 
+  # store for later access
+  var(nd_config => $config);
+
   return $config;
 }