r26324 - in /trunk/libdevel-stacktrace-perl: Build.PL Changes META.yml Makefile.PL SIGNATURE debian/changelog debian/compat debian/control debian/copyright debian/rules lib/Devel/StackTrace.pm t/01-basic.t
rmayorga-guest at users.alioth.debian.org
rmayorga-guest at users.alioth.debian.org
Wed Oct 29 00:38:25 UTC 2008
Author: rmayorga-guest
Date: Wed Oct 29 00:38:22 2008
New Revision: 26324
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26324
Log:
* New upstream release
* debian/control
+ set debhelper and compat version to 7
+ add myself to uploaders
+ add ${misc:Depends} to Depends field
+ remove libmodule-build-perl from B-D, dh7 prefer MakeMaker
* debian/rules
+ convert to dh7 using dh-make-perl -R
+ re-add IS_MAINTAINER to enable more tests
* debian/copyright - convert it to (new)version
Modified:
trunk/libdevel-stacktrace-perl/Build.PL
trunk/libdevel-stacktrace-perl/Changes
trunk/libdevel-stacktrace-perl/META.yml
trunk/libdevel-stacktrace-perl/Makefile.PL
trunk/libdevel-stacktrace-perl/SIGNATURE
trunk/libdevel-stacktrace-perl/debian/changelog
trunk/libdevel-stacktrace-perl/debian/compat
trunk/libdevel-stacktrace-perl/debian/control
trunk/libdevel-stacktrace-perl/debian/copyright
trunk/libdevel-stacktrace-perl/debian/rules
trunk/libdevel-stacktrace-perl/lib/Devel/StackTrace.pm
trunk/libdevel-stacktrace-perl/t/01-basic.t
Modified: trunk/libdevel-stacktrace-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/Build.PL?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/Build.PL (original)
+++ trunk/libdevel-stacktrace-perl/Build.PL Wed Oct 29 00:38:22 2008
@@ -8,9 +8,10 @@
my $build =
Module::Build->new( module_name => 'Devel::StackTrace',
license => 'perl',
- requires => { 'Test::More' => '0.46',
- 'File::Spec' => 0,
- 'perl' => 5.006,
+ requires => { 'File::Spec' => '0',
+ 'Scalar::Util' => '0',
+ 'Test::More' => '0.46',
+ 'perl' => '5.006',
},
sign => 1,
create_makefile_pl => 'traditional',
Modified: trunk/libdevel-stacktrace-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/Changes?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/Changes (original)
+++ trunk/libdevel-stacktrace-perl/Changes Wed Oct 29 00:38:22 2008
@@ -1,3 +1,13 @@
+1.20 Oct 25, 2008
+
+- The change in 1.15 to object creation broke the no_refs feature,
+ causing references to be stored until the trace's frame objects were
+ created.
+
+* Exception::Class objects are always stringified by calling
+ overload::StrVal().
+
+
1.1902 Jul 16, 2008
- This release just contains another test fix.
Modified: trunk/libdevel-stacktrace-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/META.yml?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/META.yml (original)
+++ trunk/libdevel-stacktrace-perl/META.yml Wed Oct 29 00:38:22 2008
@@ -1,6 +1,6 @@
---
name: Devel-StackTrace
-version: 1.1902
+version: 1.20
author:
- 'Dave Rolsky, <autarch at urth.org>'
abstract: Stack trace and stack trace frame objects
@@ -9,13 +9,14 @@
license: http://dev.perl.org/licenses/
requires:
File::Spec: 0
+ Scalar::Util: 0
Test::More: 0.46
perl: 5.006
provides:
Devel::StackTrace:
file: lib/Devel/StackTrace.pm
- version: 1.1902
-generated_by: Module::Build version 0.2808
+ version: 1.20
+generated_by: Module::Build version 0.3
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.2.html
version: 1.2
Modified: trunk/libdevel-stacktrace-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/Makefile.PL?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/Makefile.PL (original)
+++ trunk/libdevel-stacktrace-perl/Makefile.PL Wed Oct 29 00:38:22 2008
@@ -1,4 +1,5 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
+# Note: this file was auto-generated by Module::Build::Compat version 0.30
+require 5.006;
use ExtUtils::MakeMaker;
WriteMakefile
(
@@ -6,6 +7,7 @@
'VERSION_FROM' => 'lib/Devel/StackTrace.pm',
'PREREQ_PM' => {
'File::Spec' => '0',
+ 'Scalar::Util' => '0',
'Test::More' => '0.46'
},
'INSTALLDIRS' => 'site',
Modified: trunk/libdevel-stacktrace-perl/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/SIGNATURE?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/SIGNATURE (original)
+++ trunk/libdevel-stacktrace-perl/SIGNATURE Wed Oct 29 00:38:22 2008
@@ -15,15 +15,15 @@
Hash: SHA1
SHA1 7afddfc9acf24c266120ef5c2f7bd386d2d3901d .shipit
-SHA1 3d845cfeefa52ba71f90d8e43e7f17214c0365b8 Build.PL
-SHA1 c445e1b99f98b880aa20fdc891d59128925d77d7 Changes
+SHA1 e35fb27b937280dc6e1b2f441a59e47b68faa1d1 Build.PL
+SHA1 a454d582e94ca46316c818abfa36dcea056689f0 Changes
SHA1 f235ba4160673bcb7c9d58c2f09dbc7fc0efadea LICENSE
SHA1 9ed43409974a8b931e0e34af209d4f99ccc68d50 MANIFEST
-SHA1 569af5aa90ed3899d145f00abcca1cc0cbf79c08 META.yml
-SHA1 c3d9c0c03faad299fd07bf46c48f7ad0edc204a1 Makefile.PL
+SHA1 283f44833e79b89be9cdd51b9de3264d92de2822 META.yml
+SHA1 b485f5171773c668c0c0604ebf436019f9b3412e Makefile.PL
SHA1 2c9447514240fab2c68851da0e4f3dbbb2157767 README
-SHA1 263b4336563e7b017ac42f466c589f3e10e53c66 lib/Devel/StackTrace.pm
-SHA1 a2379209b184d257b818ea03c2952e836a64c8f2 t/01-basic.t
+SHA1 c71c041da6c6c63e821eed2399c1e0b64284c784 lib/Devel/StackTrace.pm
+SHA1 4a59de3a5627f92d42f794edc9f00a37911b3e73 t/01-basic.t
SHA1 21a1538da8dbde54af7a1708fa2470dd74fe67fc t/02-bad-utf8.t
SHA1 9ade2293d6e5ea77d94532132c89cd205ea85ed7 t/kwalitee.t
SHA1 28a931f3b0c075d8d6c4ce47d5e89c3fdb19ed0f t/pod-coverage.t
@@ -31,7 +31,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
-iD8DBQFIffVr3Or3ZzQuifMRAlZ7AKCGL9lujqJNySvc6x0Et9O5JQkR9QCfaO25
-pbLrUnV6b0xqqR+xW4r1TTo=
-=1UDd
+iD8DBQFJA8sa3Or3ZzQuifMRAk2uAJ0dELxZwEra89LrD/rvL7zqh2WJpgCfTI9l
++ZZvLPKf52IJkyOVjsVMKKw=
+=4/ql
-----END PGP SIGNATURE-----
Modified: trunk/libdevel-stacktrace-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/debian/changelog?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/debian/changelog (original)
+++ trunk/libdevel-stacktrace-perl/debian/changelog Wed Oct 29 00:38:22 2008
@@ -1,3 +1,18 @@
+libdevel-stacktrace-perl (1.2000-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control
+ + set debhelper and compat version to 7
+ + add myself to uploaders
+ + add ${misc:Depends} to Depends field
+ + remove libmodule-build-perl from B-D, dh7 prefer MakeMaker
+ * debian/rules
+ + convert to dh7 using dh-make-perl -R
+ + re-add IS_MAINTAINER to enable more tests
+ * debian/copyright - convert it to (new)version
+
+ -- Rene Mayorga <rmayorga at debian.org.sv> Tue, 28 Oct 2008 17:35:17 -0600
+
libdevel-stacktrace-perl (1.1902-1) unstable; urgency=low
* New upstream release.
Modified: trunk/libdevel-stacktrace-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/debian/compat?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/debian/compat (original)
+++ trunk/libdevel-stacktrace-perl/debian/compat Wed Oct 29 00:38:22 2008
@@ -1,1 +1,1 @@
-5
+7
Modified: trunk/libdevel-stacktrace-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/debian/control?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/debian/control (original)
+++ trunk/libdevel-stacktrace-perl/debian/control Wed Oct 29 00:38:22 2008
@@ -1,12 +1,12 @@
Source: libdevel-stacktrace-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5), libmodule-build-perl
+Build-Depends: debhelper (>= 7)
Build-Depends-Indep: perl (>= 5.8.0), libtest-pod-perl,
libtest-pod-coverage-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Ivan Kohler <ivan-debian at 420.am>,
- gregor herrmann <gregoa at debian.org>
+ gregor herrmann <gregoa at debian.org>, Rene Mayorga <rmayorga at debian.org.sv>
Standards-Version: 3.8.0
Homepage: http://search.cpan.org/dist/Devel-StackTrace/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdevel-stacktrace-perl/
@@ -14,7 +14,7 @@
Package: libdevel-stacktrace-perl
Architecture: all
-Depends: ${perl:Depends}
+Depends: ${perl:Depends}, ${misc:Depends}
Description: Stack trace and stack trace frame objects
The Devel::StackTrace module contains two classes, Devel::StackTrace
and Devel::StackTraceFrame. The goal of this object is to encapsulate
Modified: trunk/libdevel-stacktrace-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/debian/copyright?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/debian/copyright (original)
+++ trunk/libdevel-stacktrace-perl/debian/copyright Wed Oct 29 00:38:22 2008
@@ -1,16 +1,29 @@
-This is the debian package for the Devel::StackTrace module.
-It was created by Ivan Kohler <ivan-debian at 420.am> using dh-make-perl and is
-maintained by the Debian Perl Group.
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Dave Rolsky
+Upstream-Source: http://search.cpan.org/dist/Devel-StackTrace
+Upstream-Name: Devel-StackTrace
-Upstream source location: http://search.cpan.org/dist/Devel-StackTrace/
+Files: *
+Copyright: 2000-2006 Dave Rolsky
+License-Alias: Perl
+License: Artistic | GPL-1+
-Copyright (c) 2000-2006 Dave Rolsky
-All rights reserved.
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
+Files: debian/*
+Copyright: 2002-2008, various members of the Debian Perl Group, cf.
+ debian/changelog
+License: Artistic | GPL-1+
-Perl is distributed under your choice of the GNU General Public License or
-the Artistic License. On Debian GNU/Linux systems, the complete text of the
-GNU General Public License can be found in `/usr/share/common-licenses/GPL'
-and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in /usr/share/common-licenses/Artistic
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
Modified: trunk/libdevel-stacktrace-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/debian/rules?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/debian/rules (original)
+++ trunk/libdevel-stacktrace-perl/debian/rules Wed Oct 29 00:38:22 2008
@@ -1,63 +1,25 @@
#!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
-#
-# It was later modified by Jason Kohles <email at jasonkohles.com>
-# http://www.jasonkohles.com/ to support Module::Build installed modules
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# If set to a true value then MakeMaker's prompt function will
-# always return the default without waiting for user input.
-export PERL_MM_USE_DEFAULT=1
-
-PERL ?= /usr/bin/perl
-PACKAGE = $(shell dh_listpackages)
-TMP = $(CURDIR)/debian/$(PACKAGE)
build: build-stamp
build-stamp:
- dh_testdir
- # Add commands to compile the package here
- $(PERL) Build.PL installdirs=vendor
- $(PERL) Build
- IS_MAINTAINER=1 $(PERL) Build test
+ dh build --before test
+ IS_MAINTAINER=1 $(MAKE) test
+ dh build --after test
touch $@
clean:
- dh_testdir
- dh_testroot
- dh_clean build-stamp install-stamp
- # Add commands to clean up after the build process here
- [ ! -f Build ] || $(PERL) Build --allow_mb_mismatch 1 distclean
+ dh $@
install: install-stamp
install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- # Add commands to install the package into $(TMP) here
- $(PERL) Build install destdir=$(TMP) create_packlist=0
+ dh install
touch $@
binary-arch:
-# We have nothing to do here for an architecture-independent package
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs Changes
- dh_perl
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+binary-indep: install
+ dh $@
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary: binary-arch binary-indep
+
+.PHONY: binary binary-arch binary-indep install clean build
Modified: trunk/libdevel-stacktrace-perl/lib/Devel/StackTrace.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/lib/Devel/StackTrace.pm?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/lib/Devel/StackTrace.pm (original)
+++ trunk/libdevel-stacktrace-perl/lib/Devel/StackTrace.pm Wed Oct 29 00:38:22 2008
@@ -6,12 +6,13 @@
use warnings;
use File::Spec;
+use Scalar::Util qw( blessed );
use overload
'""' => \&as_string,
fallback => 1;
-our $VERSION = '1.1902';
+our $VERSION = '1.20';
sub new
@@ -46,6 +47,11 @@
do { package DB; @DB::args = (); caller($x++) } )
{
my @a = @DB::args;
+
+ if ( $self->{no_refs} ) {
+ @a = map { ref $_ ? $self->_ref_to_string($_) : $_ } @a;
+ }
+
push @{ $self->{raw} },
{ caller => \@c,
args => \@a,
@@ -53,6 +59,42 @@
}
}
+sub _ref_to_string
+{
+ my $self = shift;
+ my $ref = shift;
+
+ return overload::StrVal($ref)
+ if blessed $ref && $ref->isa('Exception::Class::Base');
+
+ return overload::StrVal($ref) unless $self->{respect_overload};
+ # force stringification and let overloading do its thing
+ return $ref . '';
+}
+
+sub _ecb_hack
+{
+ my $self = shift;
+ my $ref = shift;
+
+ # This avoids a loop between Exception::Class::Base and this module
+ if ( $ref->can('show_trace') )
+ {
+ my $t = $ref->show_trace;
+ $ref->show_trace(0);
+ my $s = "$ref";
+ $ref->show_trace($t);
+
+ return $s;
+ }
+ else
+ {
+ # hack but should work with older
+ # versions of E::C::B
+ return $ref->{message};
+ }
+}
+
sub _make_frames
{
my $self = shift;
@@ -96,48 +138,11 @@
if ( $self->{no_refs} )
{
- for ( grep { ref } @{$args} )
- {
- # I can't remember what this is about but I think
- # it must be to avoid a loop between between
- # Exception::Class and this module.
- if ( UNIVERSAL::isa( $_, 'Exception::Class::Base' ) )
- {
- $_ = do { if ( $_->can('show_trace') )
- {
- my $t = $_->show_trace;
- $_->show_trace(0);
- my $s = "$_";
- $_->show_trace($t);
- $s;
- }
- else
- {
- # hack but should work with older
- # versions of E::C::B
- $_->{message};
- }
- };
- }
- else
- {
- $_ = $self->_ref_as_string($_);
- }
- }
}
push @{ $self->{frames} },
Devel::StackTraceFrame->new( $c, $args,
$self->{respect_overload}, $self->{max_arg_length} );
-}
-
-sub _ref_as_string
-{
- my $self = shift;
-
- return overload::StrVal($_[0]) unless $self->{respect_overload};
- # force stringification
- return $_[0] . '';
}
sub next_frame
@@ -329,7 +334,7 @@
$_ = "undef", next unless defined $_;
# hack!
- $_ = $self->Devel::StackTrace::_ref_as_string($_)
+ $_ = $self->Devel::StackTrace::_ref_to_string($_)
if ref $_;
eval
Modified: trunk/libdevel-stacktrace-perl/t/01-basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-stacktrace-perl/t/01-basic.t?rev=26324&op=diff
==============================================================================
--- trunk/libdevel-stacktrace-perl/t/01-basic.t (original)
+++ trunk/libdevel-stacktrace-perl/t/01-basic.t Wed Oct 29 00:38:22 2008
@@ -5,7 +5,7 @@
BEGIN
{
- my $tests = 35;
+ my $tests = 37;
eval { require Exception::Class };
$tests++ if ! $@ && $Exception::Class::VERSION >= 1.09;
@@ -279,6 +279,18 @@
is( $frame->filename, 'foo/bar/baz.pm', 'filename is canonicalized' );
}
+{
+ my $obj = RefTest4->new();
+
+ my $trace = $obj->{trace};
+
+ ok( ( ! grep { ref $_ } map { @{ $_->{args} } } @{ $trace->{raw} } ),
+ 'raw data does not contain any references when no_refs is true' );
+
+ is( $trace->{raw}[1]{args}[1], 'not a ref',
+ 'non-refs are preserved properly in raw data as well' );
+}
+
# This means I can move these lines down without constantly fiddling
# with the checks for line numbers in the tests.
@@ -386,3 +398,19 @@
{
Devel::StackTrace->new( no_object_refs => 1 );
}
+
+package RefTest4;
+
+sub new
+{
+ my $self = bless {}, shift;
+
+ $self->{trace} = trace( $self, 'not a ref' );
+
+ return $self;
+}
+
+sub trace
+{
+ Devel::StackTrace->new( no_refs => 1 );
+}
More information about the Pkg-perl-cvs-commits
mailing list