SF.net SVN: ledger-smb:[4284] branches/1.3

[..hidden..]

Revision: 4284
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4284&view=rev
Author:   einhverfr
Date:     2012-02-01 02:24:00 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Improving error message when contrib/extension files not found during setup of database

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/scripts/setup.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-01-31 05:03:56 UTC (rev 4283)
+++ branches/1.3/Changelog	2012-02-01 02:24:00 UTC (rev 4284)
@@ -14,6 +14,7 @@
 * Fixed some HASH() entries in CSV templates (Chris T)
 * Removed unnecessary shebang lines in scripts/* files (Robert C)
 * Fixed GL recurring transaction not posting (Chris T)
+* Improved error handling when extensions/contrib scripts not found (Chris T)
 
 Changelog for 1.3.10
 * Fixes for permissions for exchangerate table (Erik H)

Modified: branches/1.3/scripts/setup.pl
===================================================================
--- branches/1.3/scripts/setup.pl	2012-01-31 05:03:56 UTC (rev 4283)
+++ branches/1.3/scripts/setup.pl	2012-02-01 02:24:00 UTC (rev 4284)
@@ -62,15 +62,15 @@
     if (($sv_info[0] > 9)or ($sv_info[0]  == 9 and $sv_info[1] >= 1)){
        if (! -f "$ENV{PG_CONTRIB_DIR}/tablefunc.control"){
             $request->error($request->{_locale}->text(
-                      'Cannot find Contrib scripts in [_1].',
-                      $ENV{PG_CONTRIB_DIR}
+                      'Cannot find Contrib script [_1] in [_2].',
+                      "tablefunc.control", $ENV{PG_CONTRIB_DIR}
             ));
        }
     } else {
        if (! -f "$ENV{PG_CONTRIB_DIR}/tablefunc.sql"){
             $request->error($request->{_locale}->text(
-                      'Cannot find Contrib scripts in [_1].',
-                      $ENV{PG_CONTRIB_DIR}
+                      'Cannot find Contrib script [_1] in [_2].',
+                      "tablefunc.sql", $ENV{PG_CONTRIB_DIR}
             ));
       
        }

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