[liberror-perl] 26/28: Revert direct changes to the code.

gregor herrmann gregoa at debian.org
Sun Jul 17 14:55:42 UTC 2016


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository liberror-perl.

commit 8ffbdfc51b861ad98853b0edfdcaf02dfa4cb7f5
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Jul 17 16:46:48 2016 +0200

    Revert direct changes to the code.
    
    Both set of changes are not required anymore:
    - The problem from #180784 doesn't appear if the line is removed. Probably
      as a fix for CPAN RT#20643 in 0.17009.
    - The changes to the POD (minus in manpages) seem unncessary, at least
      nothing complains.
---
 lib/Error.pm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/Error.pm b/lib/Error.pm
index 4148b38..f0fa207 100644
--- a/lib/Error.pm
+++ b/lib/Error.pm
@@ -308,7 +308,6 @@ use vars qw(@EXPORT_OK @ISA %EXPORT_TAGS);
 sub run_clauses ($$$\@) {
     my($clauses,$err,$wantarray,$result) = @_;
     my $code = undef;
-    local $Error::THROWN = undef;
 
     $err = $Error::ObjectifyCallback->({'text' =>$err}) unless ref($err);
 
@@ -648,11 +647,11 @@ from doing so. See the "SEE ALSO" section below for better recommendations.
     }
     catch Error::IO with {
 	my $E = shift;
-	print STDERR "File ", $E->{'\-file'}, " had a problem\n";
+	print STDERR "File ", $E->{'-file'}, " had a problem\n";
     }
     except {
 	my $E = shift;
-	my $general_handler=sub {send_message $E->{\-description}};
+	my $general_handler=sub {send_message $E->{-description}};
 	return {
 	    UserException1 => $general_handler,
 	    UserException2 => $general_handler
@@ -762,11 +761,11 @@ with the arguments that are passed to it's constructor. The elements
 that are used by, or are retrievable by the C<Error> class are listed
 below, other classes may add to these.
 
-	\-file
-	\-line
-	\-text
-	\-value
-	\-object
+	-file
+	-line
+	-text
+	-value
+	-object
 
 If C<-file> or C<-line> are not specified in the constructor arguments
 then these will be initialized with the file name and line number where

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/liberror-perl.git



More information about the Pkg-perl-cvs-commits mailing list