[freeside-commits] freeside/FS/FS UID.pm,1.42,1.43

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv6444

Modified Files:
	UID.pm 
Log Message:
please mr. bootstrapping tree, give us some bootsap

Index: UID.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/UID.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- UID.pm	9 Apr 2008 21:17:05 -0000	1.42
+++ UID.pm	9 Apr 2008 21:27:14 -0000	1.43
@@ -114,13 +114,10 @@
 
   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) {