Merge branch 'og-deployusers-fix'

Conflicts:
	Netdisco/Changes

Netdisco/Changes

@@ -10,6 +10,12 @@
 
   * Kwalitee fixes
 
+2.023002 - 2014-02-17
+
+  [BUG FIXES]
+
+  * Deploy new admin user did not use resultset
+
 2.023001 - 2014-02-14
 
   [ENHANCEMENTS]

Netdisco/META.yml

@@ -74,4 +74,4 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/bsd-license.php
   repository: git://git.code.sf.net/p/netdisco/netdisco-ng
-version: 2.023001
+version: 2.023002

Netdisco/bin/netdisco-deploy

@@ -122,8 +122,8 @@ sub _make_password {
   }
 }
 
-my $users = schema('netdisco')->resultset('User')->search({-bool => 'admin'});
-if ($users->count == 0) {
+my $users = schema('netdisco')->resultset('User');
+if ($users->search({-bool => 'admin'})->count == 0) {
     say '';
     print color 'bold green';
     say 'We need to create a user for inital login. This user will be a full Administrator.';

Netdisco/lib/App/Netdisco.pm

@@ -7,7 +7,7 @@ use 5.010_000;
 use File::ShareDir 'dist_dir';
 use Path::Class;
 
-our $VERSION = '2.023001';
+our $VERSION = '2.023002';
 
 BEGIN {
   if (not ($ENV{DANCER_APPDIR} || '')