[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[6964] trunk/LedgerSMB



Revision: 6964
          http://sourceforge.net/p/ledger-smb/code/6964
Author:   einhverfr
Date:     2014-04-04 07:08:58 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
Fixing inability to create db in refactored setup.pm/Database.pm

Modified Paths:
--------------
    trunk/LedgerSMB/Auth.pm
    trunk/LedgerSMB/Database.pm
    trunk/LedgerSMB/Scripts/setup.pm

Modified: trunk/LedgerSMB/Auth.pm
===================================================================
--- trunk/LedgerSMB/Auth.pm	2014-04-01 02:46:30 UTC (rev 6963)
+++ trunk/LedgerSMB/Auth.pm	2014-04-04 07:08:58 UTC (rev 6964)
@@ -64,6 +64,8 @@
     $msg_plus = '' if not defined $msg_plus;
     my $cgi = CGI::Simple->new();
 
+    die 'foo';
+
     my $err = {
 	'500' => {status  => '500 Internal Server Error', 
 		  message => 'An error occurred. Information on this error has been logged.', 

Modified: trunk/LedgerSMB/Database.pm
===================================================================
--- trunk/LedgerSMB/Database.pm	2014-04-01 02:46:30 UTC (rev 6963)
+++ trunk/LedgerSMB/Database.pm	2014-04-04 07:08:58 UTC (rev 6964)
@@ -453,7 +453,7 @@
     my $dbh = DBI->connect(
         "dbi:Pg:dbname=$dbName", 
          "$creds->{login}", "$creds->{password}", { AutoCommit => 0 }
-    ) or LedgerSMB::Auth::credential_prompt;
+    ) or return undef;
     my ($version) = $dbh->selectrow_array('SELECT version()');
     $version =~ /(\d+\.\d+\.\d+)/;
     my $retval = $1;

Modified: trunk/LedgerSMB/Scripts/setup.pm
===================================================================
--- trunk/LedgerSMB/Scripts/setup.pm	2014-04-01 02:46:30 UTC (rev 6963)
+++ trunk/LedgerSMB/Scripts/setup.pm	2014-04-04 07:08:58 UTC (rev 6964)
@@ -26,6 +26,7 @@
 use LedgerSMB::Sysconfig;
 use LedgerSMB::Template::DB;
 use LedgerSMB::Setting;
+use Carp::Always;
 use strict;
 
 my $logger = Log::Log4perl->get_logger('LedgerSMB::Scripts::setup');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits