You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
61 lines
2.1 KiB
61 lines
2.1 KiB
7 years ago
|
From 915ceb2f33469eeffd28cfb81ca52a05e1301f15 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||
|
|
Date: Fri, 14 Sep 2012 13:17:29 +0200
|
||
|
|
Subject: [PATCH] Override the Pod::Simple::parse_file
|
||
|
|
|
||
|
|
This sets output_fh to STDOUT if it's not already set.
|
||
|
|
This resolves CPANRT#77530 and RHBZ#826872 and is fixed in podlators-2.4.1.
|
||
|
|
Ported to perl-5.14.2.
|
||
|
|
---
|
||
|
|
cpan/podlators/lib/Pod/Man.pm | 11 +++++++++++
|
||
|
|
cpan/podlators/lib/Pod/Text.pm | 11 +++++++++++
|
||
|
|
2 files changed, 22 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/cpan/podlators/lib/Pod/Man.pm b/cpan/podlators/lib/Pod/Man.pm
|
||
|
|
index 96f3fcc..ad5e5ac 100644
|
||
|
|
--- a/cpan/podlators/lib/Pod/Man.pm
|
||
|
|
+++ b/cpan/podlators/lib/Pod/Man.pm
|
||
|
|
@@ -1302,6 +1302,17 @@ sub parse_from_filehandle {
|
||
|
|
$self->parse_from_file (@_);
|
||
|
|
}
|
||
|
|
|
||
|
|
+# Pod::Simple's parse_file doesn't set output_fh. Wrap the call and do so
|
||
|
|
+# ourself unless it was already set by the caller, since our documentation has
|
||
|
|
+# always said that this should work.
|
||
|
|
+sub parse_file {
|
||
|
|
+ my ($self, $in) = @_;
|
||
|
|
+ unless (defined $$self{output_fh}) {
|
||
|
|
+ $self->output_fh (\*STDOUT);
|
||
|
|
+ }
|
||
|
|
+ return $self->SUPER::parse_file ($in);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
##############################################################################
|
||
|
|
# Translation tables
|
||
|
|
##############################################################################
|
||
|
|
diff --git a/cpan/podlators/lib/Pod/Text.pm b/cpan/podlators/lib/Pod/Text.pm
|
||
|
|
index cc02820..1a8b0bf 100644
|
||
|
|
--- a/cpan/podlators/lib/Pod/Text.pm
|
||
|
|
+++ b/cpan/podlators/lib/Pod/Text.pm
|
||
|
|
@@ -679,6 +679,17 @@ sub parse_from_filehandle {
|
||
|
|
$self->parse_from_file (@_);
|
||
|
|
}
|
||
|
|
|
||
|
|
+# Pod::Simple's parse_file doesn't set output_fh. Wrap the call and do so
|
||
|
|
+# ourself unless it was already set by the caller, since our documentation has
|
||
|
|
+# always said that this should work.
|
||
|
|
+sub parse_file {
|
||
|
|
+ my ($self, $in) = @_;
|
||
|
|
+ unless (defined $$self{output_fh}) {
|
||
|
|
+ $self->output_fh (\*STDOUT);
|
||
|
|
+ }
|
||
|
|
+ return $self->SUPER::parse_file ($in);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
##############################################################################
|
||
|
|
# Module return value and documentation
|
||
|
|
##############################################################################
|
||
|
|
--
|
||
|
|
1.7.11.4
|
||
|
|
|