[libyaml-appconfig-perl] 02/04: Drop no-UNIVERSAL-import.patch patch

Salvatore Bonaccorso carnil at debian.org
Sat Mar 22 21:02:42 UTC 2014


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

carnil pushed a commit to branch master
in repository libyaml-appconfig-perl.

commit dc2034a13c485e191185c2cc98a4031b12f5ffd9
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Sat Mar 22 21:58:15 2014 +0100

    Drop no-UNIVERSAL-import.patch patch
---
 debian/patches/no-UNIVERSAL-import.patch | 42 --------------------------------
 debian/patches/series                    |  1 -
 2 files changed, 43 deletions(-)

diff --git a/debian/patches/no-UNIVERSAL-import.patch b/debian/patches/no-UNIVERSAL-import.patch
deleted file mode 100644
index 1fa9ab0..0000000
--- a/debian/patches/no-UNIVERSAL-import.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Replace UNIVERSAL's isa with simple ref() check
- Importing and using UNIVERSAL's isa is deprecated with Perl 5.12
- Instead, a simple check for ref($value) brings the same result
-Author: Damyan Ivanov <dmn at debian.org>
-Bug-Debian: http://bugs.debian.org/614875
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=65539
-
---- a/lib/YAML/AppConfig.pm
-+++ b/lib/YAML/AppConfig.pm
-@@ -2,7 +2,6 @@ package YAML::AppConfig;
- use strict;
- use warnings;
- use Carp;
--use UNIVERSAL qw(isa);
- use Storable qw(dclone);  # For Deep Copy
- 
- ####################
-@@ -113,7 +112,7 @@ sub _resolve_refs {
-     if ( not ref $value ) {
-         $value = $self->_resolve_scalar($value);
-     }
--    elsif ( isa $value, 'HASH' ) {
-+    elsif ( ref($value) eq 'HASH' ) {
-         $value = dclone($value);
-         my @hidden = $self->_push_scope($value);
-         for my $key ( keys %$value ) {
-@@ -122,13 +121,13 @@ sub _resolve_refs {
-         $self->_pop_scope(@hidden);
-         return $value;
-     }
--    elsif ( isa $value, 'ARRAY' ) {
-+    elsif ( ref($value) eq 'ARRAY' ) {
-         $value = dclone($value);
-         for my $item (@$value) {
-             $item = $self->_resolve_refs( $item );
-         }
-     }
--    elsif ( isa $value, 'SCALAR' ) {
-+    elsif ( ref($value) eq 'SCALAR' ) {
-         $value = $self->_resolve_scalar($$value);
-     } 
-     else {
diff --git a/debian/patches/series b/debian/patches/series
index 28801f0..750b810 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-no-UNIVERSAL-import.patch
 fix-POD-errors.patch

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



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