please mr. bootstrapping tree, give us some bootsap
authorivan <ivan>
Wed, 9 Apr 2008 21:27:14 +0000 (21:27 +0000)
committerivan <ivan>
Wed, 9 Apr 2008 21:27:14 +0000 (21:27 +0000)
FS/FS/UID.pm

index a94e90f..dd4850f 100644 (file)
@@ -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) {