From 0ea259968caa20ba0833f07cfc26adc85dff2800 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Apr 2008 21:27:14 +0000
Subject: [PATCH] please mr. bootstrapping tree, give us some bootsap

---
 FS/FS/UID.pm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index a94e90f86..dd4850fb2 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -114,13 +114,10 @@ sub forksuidsetup {
 
   warn "$me forksuidsetup deciding upon config system to use\n" if $DEBUG;
 
-  my $sth = '';
-  if ( dbdef->table('conf')
-       and $sth = $dbh->prepare("SELECT COUNT(*) FROM conf")
-       and $sth->execute
-     )
-  {
+  if ( ! $FS::Schema::setup_hack && dbdef->table('conf') ) {
 
+    my $sth = $dbh->prepare("SELECT COUNT(*) FROM conf") or die $dbh->errstr;
+    $sth->execute or die $sth->errstr;
     my $confcount = $sth->fetchrow_arrayref->[0];
   
     if ($confcount) {
-- 
2.11.0