pghmcfc pushed to perl-Path-Tiny (perl-Path-Tiny-0.070-2.fc24). "Fix FTBFS with latest File::Path (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Jul 20 12:57:29 UTC 2015


From 0b3015d089c57cbb79b81830f7d8c643b26a0e1f Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul at city-fan.org>
Date: Mon, 20 Jul 2015 13:51:24 +0100
Subject: Fix FTBFS with latest File::Path

Fixed incorrect error argument for File::Path functions (mkpath and
remove_tree) (GH#144)

diff --git a/Path-Tiny-0.070-GH144.patch b/Path-Tiny-0.070-GH144.patch
new file mode 100644
index 0000000..402ca0e
--- /dev/null
+++ b/Path-Tiny-0.070-GH144.patch
@@ -0,0 +1,24 @@
+diff --git a/lib/Path/Tiny.pm b/lib/Path/Tiny.pm
+index aa194be..a0ee46f 100644
+--- a/lib/Path/Tiny.pm
++++ b/lib/Path/Tiny.pm
+@@ -1112,7 +1112,7 @@ sub mkpath {
+     my ( $self, $args ) = @_;
+     $args = {} unless ref $args eq 'HASH';
+     my $err;
+-    $args->{err} = \$err unless defined $args->{err};
++    $args->{error} = \$err unless defined $args->{error};
+     require File::Path;
+     my @dirs = File::Path::make_path( $self->[PATH], $args );
+     if ( $err && @$err ) {
+@@ -1369,8 +1369,8 @@ sub remove_tree {
+     return 0 if !-e $self->[PATH] && !-l $self->[PATH];
+     $args = {} unless ref $args eq 'HASH';
+     my $err;
+-    $args->{err}  = \$err unless defined $args->{err};
+-    $args->{safe} = 1     unless defined $args->{safe};
++    $args->{error} = \$err unless defined $args->{error};
++    $args->{safe}  = 1     unless defined $args->{safe};
+     require File::Path;
+     my $count = File::Path::remove_tree( $self->[PATH], $args );
+ 
diff --git a/perl-Path-Tiny.spec b/perl-Path-Tiny.spec
index 860c0c3..e68c180 100644
--- a/perl-Path-Tiny.spec
+++ b/perl-Path-Tiny.spec
@@ -1,11 +1,12 @@
 Name:		perl-Path-Tiny
 Version:	0.070
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	File path utility
 Group:		Development/Libraries
 License:	ASL 2.0
 URL:		http://search.cpan.org/dist/Path-Tiny/
 Source0:	http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/Path-Tiny-%{version}.tar.gz
+Patch0:		Path-Tiny-0.070-GH144.patch
 BuildArch:	noarch
 # Module Build
 BuildRequires:	coreutils
@@ -85,6 +86,9 @@ CRLF translation.
 %prep
 %setup -q -n Path-Tiny-%{version}
 
+# Fixed incorrect error argument for File::Path functions (mkpath and remove_tree)
+%patch0 -p1
+
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -104,6 +108,10 @@ make test
 %{_mandir}/man3/Path::Tiny.3*
 
 %changelog
+* Mon Jul 20 2015 Paul Howarth <paul at city-fan.org> - 0.070-2
+- Fixed incorrect error argument for File::Path functions (mkpath and
+  remove_tree) (GH#144)
+
 * Mon Jun 29 2015 Paul Howarth <paul at city-fan.org> - 0.070-1
 - Update to 0.070
   - The 'copy' method now returns the object for the copied file
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-Path-Tiny.git/commit/?h=perl-Path-Tiny-0.070-2.fc24&id=0b3015d089c57cbb79b81830f7d8c643b26a0e1f


More information about the perl-devel mailing list