[libfile-rsync-perl] 03/03: Manually refresh skip-badoption-test-in-autopkgtest.patch

[Axel Beckert]

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

abe pushed a commit to branch master
in repository libfile-rsync-perl.

commit 529aeecd50335c6421cbf5e56f901bcc3ab9dcd8
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Fri Sep 4 23:49:37 2015 +0200

    Manually refresh skip-badoption-test-in-autopkgtest.patch
---
 debian/changelog                                   |  1 +
 .../skip-badoption-test-in-autopkgtest.patch       | 40 +++++++++++-----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b18fd7..baebf58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libfile-rsync-perl (0.46-1) UNRELEASED; urgency=medium
 
   * Import upstream version 0.46
+    + Manually refresh skip-badoption-test-in-autopkgtest.patch.
 
  -- Axel Beckert <abe at debian.org>  Fri, 04 Sep 2015 23:22:24 +0200
 
diff --git a/debian/patches/skip-badoption-test-in-autopkgtest.patch b/debian/patches/skip-badoption-test-in-autopkgtest.patch
index 8be1ee8..c1b0d2d 100644
--- a/debian/patches/skip-badoption-test-in-autopkgtest.patch
+++ b/debian/patches/skip-badoption-test-in-autopkgtest.patch
@@ -6,34 +6,34 @@ Forwarded: not-needed
 Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
 Last-Update: 2015-08-16
 
---- a/test.pl
-+++ b/test.pl
-@@ -8,7 +8,7 @@ use strict;
+Index: libfile-rsync-perl/test.pl
+===================================================================
+--- libfile-rsync-perl.orig/test.pl	2015-09-04 23:48:14.096590750 +0200
++++ libfile-rsync-perl/test.pl	2015-09-04 23:48:14.096590750 +0200
+@@ -8,7 +8,7 @@
+ use strict;
  use vars qw($loaded $fail);
- $loaded=1;
- $fail=0;
--warn "\nNOTE: expect 'badoption' message for test 7\n\n";
-+warn "\nNOTE: expect 'badoption' message for test 7\n\n" if(!$ENV{ADTTMP});
- print "ok 1\n";
+ $loaded = 1;
+-note "NOTE: expect 'badoption' message for test 7";
++note "NOTE: expect 'badoption' message for test 7" if(!$ENV{ADTTMP});
+ note "NOTE: expect 'deprecated' message for test 8";
+ ok($loaded, 'module loaded');
  
- unless (whence('rsync')) {
-@@ -83,12 +83,14 @@ system qw(rm -rf destdir);
-    print "ok 6\n";
+@@ -85,11 +85,13 @@
+    );
  }
  
--system qw(rm -rf destdir);
+-rmtree('destdir');
 +if(!$ENV{ADTTMP}) {
-+   system qw(rm -rf destdir);
++   rmtree('destdir');
  # invalid option
 -{
--   my $rs=File::Rsync->new(archive => 1, badoption => 1);
--   $rs && ($fail++,print "not ");
--   print "ok 7\n";
+-   my $rs = File::Rsync->new(archive => 1, badoption => 1);
+-   ok(!defined($rs), 'invalid option');
 +   {
-+      my $rs=File::Rsync->new(archive => 1, badoption => 1);
-+      $rs && ($fail++,print "not ");
-+      print "ok 7\n";
++      my $rs = File::Rsync->new(archive => 1, badoption => 1);
++      ok(!defined($rs), 'invalid option');
 +   }
  }
  
- system qw(rm -rf destdir);
+ # deprecated hash ref

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