[freeside-commits] freeside/rt/lib RT.pm, 1.10, 1.10.4.1 RT.pm.in, 1.4, 1.4.4.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/rt/lib
In directory wavetail.420.am:/tmp/cvs-serv23950/lib

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	RT.pm RT.pm.in 
Log Message:
landing 3.8.9 on 2.1 branch for 2.1.3

Index: RT.pm.in
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/lib/RT.pm.in,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -w -d -r1.4 -r1.4.4.1
--- RT.pm.in	18 May 2010 19:58:39 -0000	1.4
+++ RT.pm.in	8 Apr 2011 23:13:49 -0000	1.4.4.1
@@ -2,8 +2,8 @@
 # 
 # COPYRIGHT:
 # 
-# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-#                                          <jesse at bestpractical.com>
+# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+#                                          <sales at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -401,13 +401,20 @@
         die sprintf "RT requires Perl v5.8.3 or newer.  Your current Perl is v%vd\n", $^V; 
     }
 
-    local ($@);
+    # use $error here so the following "die" can still affect the global $@
+    my $error;
+    {
+        local $@;
     eval { 
         my $x = ''; 
         my $y = \$x;
-        require Scalar::Util; Scalar::Util::weaken($y);
+            require Scalar::Util;
+            Scalar::Util::weaken($y);
     };
-    if ($@) {
+        $error = $@;
+    }
+
+    if ($error) {
         die <<"EOF";
 
 RT requires the Scalar::Util module be built with support for  the 'weaken'
@@ -487,7 +494,10 @@
         my $scrips = RT::Scrips->new($RT::SystemUser);
         $scrips->Limit( FIELD => 'Stage', OPERATOR => '!=', VALUE => 'Disabled' );
         while ( my $scrip = $scrips->Next ) {
-            $scrip->LoadModules;
+            local $@;
+            eval { $scrip->LoadModules } or
+                $RT::Logger->error("Invalid Scrip ".$scrip->Id.".  Unable to load the Action or Condition.  ".
+                                   "You should delete or repair this Scrip in the admin UI.\n$@\n");
         }
 
 	foreach my $class ( grep $_, RT->Config->Get('CustomFieldValuesSources') ) {

Index: RT.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/lib/RT.pm,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -w -d -r1.10 -r1.10.4.1
--- RT.pm	18 May 2010 19:58:39 -0000	1.10
+++ RT.pm	8 Apr 2011 23:13:49 -0000	1.10.4.1
@@ -2,8 +2,8 @@
 # 
 # COPYRIGHT:
 # 
-# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-#                                          <jesse at bestpractical.com>
+# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+#                                          <sales at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -57,7 +57,7 @@
 
 use vars qw($Config $System $SystemUser $Nobody $Handle $Logger $_INSTALL_MODE);
 
-our $VERSION = '3.8.8';
+our $VERSION = '3.8.9';
 
 
 
@@ -401,13 +401,20 @@
         die sprintf "RT requires Perl v5.8.3 or newer.  Your current Perl is v%vd\n", $^V; 
     }
 
-    local ($@);
+    # use $error here so the following "die" can still affect the global $@
+    my $error;
+    {
+        local $@;
     eval { 
         my $x = ''; 
         my $y = \$x;
-        require Scalar::Util; Scalar::Util::weaken($y);
+            require Scalar::Util;
+            Scalar::Util::weaken($y);
     };
-    if ($@) {
+        $error = $@;
+    }
+
+    if ($error) {
         die <<"EOF";
 
 RT requires the Scalar::Util module be built with support for  the 'weaken'
@@ -487,7 +494,10 @@
         my $scrips = RT::Scrips->new($RT::SystemUser);
         $scrips->Limit( FIELD => 'Stage', OPERATOR => '!=', VALUE => 'Disabled' );
         while ( my $scrip = $scrips->Next ) {
-            $scrip->LoadModules;
+            local $@;
+            eval { $scrip->LoadModules } or
+                $RT::Logger->error("Invalid Scrip ".$scrip->Id.".  Unable to load the Action or Condition.  ".
+                                   "You should delete or repair this Scrip in the admin UI.\n$@\n");
         }
 
 	foreach my $class ( grep $_, RT->Config->Get('CustomFieldValuesSources') ) {