On Wed, 2009-11-11 at 22:34 +0000, Steve Hay wrote:
> 2009/11/5 C.J. Adams-Collier <cjac@colliertech.org>:
> > On Tue, 2009-11-03 at 23:27 +0000, Steve Hay wrote:
> >> 2009/11/3 C.J. Adams-Collier <cjac@colliertech.org>:
> >> > Hey there. I'm going to package this up. Want a patch to fix the POD
> >> > test failure?
> >> >
> >> > At least I *think* it is in this package...
> >> >
> >>
> >> Yes, if you have a patch then I'd be happy to receive it.
> >
> > The point has been raised that OpenSSL is incompatible with the GPL. Do
> > you feel like patching your code to indicate this? We'll bring it up in
> > the debian-specific copyright file either way, but thought it might be
> > good for you to know.
> >
>
> Thanks for the heads-up. I'll add a note to LICENCE that OpenSSL is
> distributed under a BSD-style licence. Note that LICENCE already
> mentions that two of the functions included in Filter-Crypto are based
> on code taken from mod_ssl, which is also distributed under a
> BSD-style licence.
Yeah, we've been using that. Thanks!
http://svn.debian.org/viewsvn/pkg-perl/trunk/libfilter-crypto-perl/debian/copyright?revision=46861
> Btw, regarding your fix for the POD test failures, I'd like to do
> something about this. I've just got two FAIL reports in from CPAN
> Testers regarding this bug. Both are on Debian:
>
> http://nntp.x.perl.org/group/perl.cpan.testers/5926663
> http://nntp.x.perl.org/group/perl.cpan.testers/5916199
>
> I think the easiest thing to do would be to skip the test concerned
> when running on Debian with Pod::Perldoc's VERSION (and/or perldoc's
> VERSION if it has one) less than a certain value, or failing that,
> just skip it when the Debian version is level than a certain value.
> Can you tell me what the appropriate version(s) are that I'd need to
> skip the test on?
The perl-doc package diverts /usr/bin/perldoc to /usr/bin/perldoc.stub
when it is installed, so you could use something like this:
$ echo '$x = "is not"; $x = "is" if -e q{/usr/bin/perldoc.stub}; print "perl-doc $x installed\n"' > /tmp/foo;\
perl /tmp/foo &&\
sudo apt-get -y install perl-doc >/dev/null 2>&1 ;\
perl /tmp/foo
perl-doc is not installed
perl-doc is installed
All Debian-based hosts have a file /etc/debian_version, so
-e /etc/debian_version will be enough to know if you're on a system
where you should determine whether you should check
for /usr/bin/perldoc.stub. Maybe something like the attached?
> Thanks,
> Steve
Cheers,
C.J.
diff --git a/t/03_script.t b/t/03_script.t
index f8bbf12..ab71428 100755
--- a/t/03_script.t
+++ b/t/03_script.t
@@ -604,25 +604,30 @@ MAIN: {
^ Options: /mosx,
'-h option works');
- {
- local $ENV{PERLDOC} = '-t';
- chomp($data = qx{$perl $crypt_file -m});
- like($data, qr/^ NAME .*?
- ^ SYNOPSIS .*?
- ^ ARGUMENTS .*?
- ^ OPTIONS .*?
- ^ EXIT\ STATUS .*?
- ^ DIAGNOSTICS .*?
- ^ EXAMPLES .*?
- ^ ENVIRONMENT .*?
- ^ SEE\ ALSO .*?
- ^ AUTHOR .*?
- ^ COPYRIGHT .*?
- ^ LICENCE .*?
- ^ VERSION .*?
- ^ DATE .*?
- ^ HISTORY /mosx,
- '-m option works');
+ SKIP: {
+ skip 'debian host without perl-doc installed', 1
+ if( -e q{/etc/debian_version} && # Debian-based host
+ !-e q{/usr/bin/perldoc.stub} # perl-doc has not diverted /usr/bin/perldoc
+ );
+
+ local $ENV{PERLDOC} = '-t';
+ chomp($data = qx{$perl $crypt_file -m});
+ like($data, qr/^ NAME .*?
+ ^ SYNOPSIS .*?
+ ^ ARGUMENTS .*?
+ ^ OPTIONS .*?
+ ^ EXIT\ STATUS .*?
+ ^ DIAGNOSTICS .*?
+ ^ EXAMPLES .*?
+ ^ ENVIRONMENT .*?
+ ^ SEE\ ALSO .*?
+ ^ AUTHOR .*?
+ ^ COPYRIGHT .*?
+ ^ LICENCE .*?
+ ^ VERSION .*?
+ ^ DATE .*?
+ ^ HISTORY /mosx,
+ '-m option works');
}
unlink $mbfile;
Attachment:
signature.asc
Description: This is a digitally signed message part