r55839 - in /branches/upstream/libdevel-caller-perl/current: Changes META.yml lib/Devel/Caller.pm

[ansgar-guest at users.alioth.debian.org]

Author: ansgar-guest
Date: Sat Apr 10 08:20:01 2010
New Revision: 55839

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=55839
Log:
[svn-upgrade] Integrating new upstream version, libdevel-caller-perl (2.05)

Modified:
    branches/upstream/libdevel-caller-perl/current/Changes
    branches/upstream/libdevel-caller-perl/current/META.yml
    branches/upstream/libdevel-caller-perl/current/lib/Devel/Caller.pm

Modified: branches/upstream/libdevel-caller-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdevel-caller-perl/current/Changes?rev=55839&op=diff
==============================================================================
--- branches/upstream/libdevel-caller-perl/current/Changes (original)
+++ branches/upstream/libdevel-caller-perl/current/Changes Sat Apr 10 08:20:01 2010
@@ -1,3 +1,7 @@
+2.05 Thursday 8th April, 2010
+	Don't call B::PADOP->gv.  Work by by Florian Ragwitz
+	http://github.com/rafl/perl-devel-caller/commit/248a23390eef48a73bb717be085da58ce50ff784
+
 2.04 Tuesday 16th February, 2010
 	Use CxTYPE macro rather than directly inspecting cx->cx_type
 	http://rt.cpan.org/Public/Bug/Display.html?id=33005

Modified: branches/upstream/libdevel-caller-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdevel-caller-perl/current/META.yml?rev=55839&op=diff
==============================================================================
--- branches/upstream/libdevel-caller-perl/current/META.yml (original)
+++ branches/upstream/libdevel-caller-perl/current/META.yml Sat Apr 10 08:20:01 2010
@@ -1,13 +1,11 @@
 --- #YAML:1.0
 name:               Devel-Caller
-version:            2.04
+version:            2.05
 abstract:           ~
 author:  []
 license:            unknown
 distribution_type:  module
 configure_requires:
-    ExtUtils::MakeMaker:  0
-build_requires:
     ExtUtils::MakeMaker:  0
 requires:
     PadWalker:   0.08
@@ -16,7 +14,7 @@
     directory:
         - t
         - inc
-generated_by:       ExtUtils::MakeMaker version 6.50
+generated_by:       ExtUtils::MakeMaker version 6.48
 meta-spec:
     url:      http://module-build.sourceforge.net/META-spec-v1.4.html
     version:  1.4

Modified: branches/upstream/libdevel-caller-perl/current/lib/Devel/Caller.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdevel-caller-perl/current/lib/Devel/Caller.pm?rev=55839&op=diff
==============================================================================
--- branches/upstream/libdevel-caller-perl/current/lib/Devel/Caller.pm (original)
+++ branches/upstream/libdevel-caller-perl/current/lib/Devel/Caller.pm Sat Apr 10 08:20:01 2010
@@ -7,7 +7,7 @@
 use base qw( Exporter  );
 use 5.008;
 
-our $VERSION = '2.04';
+our $VERSION = '2.05';
 XSLoader::load __PACKAGE__, $VERSION;
 
 our @EXPORT_OK = qw( caller_cv caller_args caller_vars called_with called_as_method );
@@ -92,14 +92,19 @@
             }
 
             my $consider = ($op->name eq "gvsv") ? $op : $prev;
-            my $gv = $consider->gv;
-            print "consider: $consider ", $consider->name, " gv $gv\n"
-              if $DEBUG;
+            my $gv;
+
             if (ref $consider eq 'B::PADOP') {
                 print "GV is really a padgv\n" if $DEBUG;
                 $gv = $padv->ARRAYelt( $consider->padix );
                 print "NEW GV $gv\n" if $DEBUG;
             }
+            else {
+                $gv = $consider->gv;
+            }
+
+            print "consider: $consider ", $consider->name, " gv $gv\n"
+              if $DEBUG;
 
             if ($want_names) {
                 my %sigils = (