all debian patches are now upstream

[perltidy.git] / debian / patches / die_on_unlink_failures

diff --git a/debian/patches/die_on_unlink_failures b/debian/patches/die_on_unlink_failures
deleted file mode 100644 (file)
index 7b4d3d9..0000000
--- a/debian/patches/die_on_unlink_failures
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: die if perltidy.ERR and other temporary files cannot be unlinked
-Origin: Upstream, Cherrypicked from 20170521.
-Author: Don Armstrong <don@debian.org>, Steve Hancock
-diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm
-index 2b0df0e..edcec6d 100644
---- a/lib/Perl/Tidy.pm
-+++ b/lib/Perl/Tidy.pm
-@@ -3692,7 +3702,10 @@ sub do_syntax_check {
-     # now wish for luck...
-     my $msg = qx/perl $flags $quoted_stream_filename $error_redirection/;
- 
--    unlink $stream_filename if ($is_tmpfile);
-+    if ($is_tmpfile) {
-+        unlink $stream_filename
-+          or Perl::Tidy::Die("couldn't unlink stream $stream_filename: $!\n");
-+    }
-     return $stream_filename, $msg;
- }
- 
-@@ -4128,7 +4143,11 @@ sub new {
- 
-     # remove any old error output file if we might write a new one
-     unless ( $fh_warnings || ref($warning_file) ) {
--        if ( -e $warning_file ) { unlink($warning_file) }
-+        if ( -e $warning_file ) {
-+            unlink($warning_file)
-+              or Perl::Tidy::Die(
-+                "couldn't unlink warning file $warning_file: $!\n");
-+        }
-     }
- 
-     my $logfile_gap =