Change 31072 by [EMAIL PROTECTED] on 2007/04/25 11:00:34
Upgrade to CPAN-1.9101
Affected files ...
... //depot/perl/lib/CPAN.pm#116 edit
... //depot/perl/lib/CPAN/Kwalify/distroprefs.dd#3 edit
Differences ...
==== //depot/perl/lib/CPAN.pm#116 (text) ====
Index: perl/lib/CPAN.pm
--- perl/lib/CPAN.pm#115~30989~ 2007-04-19 18:58:55.000000000 -0700
+++ perl/lib/CPAN.pm 2007-04-25 04:00:34.000000000 -0700
@@ -1,7 +1,7 @@
# -*- Mode: cperl; coding: utf-8; cperl-indent-level: 4 -*-
use strict;
package CPAN;
-$CPAN::VERSION = '1.91';
+$CPAN::VERSION = '1.9101';
$CPAN::VERSION = eval $CPAN::VERSION if $CPAN::VERSION =~ /_/;
use CPAN::HandleConfig;
@@ -2838,6 +2838,7 @@
if ($CPAN::META->has_inst("File::Temp")) {
$installation_report_fh
= File::Temp->new(
+ dir => File::Spec->tmpdir,
template => 'cpan_install_XXXX',
suffix => '.txt',
unlink => 0,
@@ -4636,7 +4637,10 @@
# $DB::single = 1;
if ($do->{make_test}
&& $do->{build_dir}
- && !$do->{make_test}->failed
+ && !(UNIVERSAL::can($do->{make_test},"failed") ?
+ $do->{make_test}->failed :
+ $do->{make_test} =~ /^YES/
+ )
&& (
!$do->{install}
||
@@ -8588,6 +8592,7 @@
my($fh,$filename);
if ($CPAN::META->has_inst("File::Temp")) {
$fh = File::Temp->new(
+ dir => File::Spec->tmpdir,
template => 'cpan_htmlconvert_XXXX',
suffix => '.txt',
unlink => 0,
@@ -8647,6 +8652,7 @@
my($fh,$filename);
if ($CPAN::META->has_inst("File::Temp")) {
$fh = File::Temp->new(
+ dir => File::Spec->tmpdir,
template => "cpan_getsave_url_XXXX",
suffix => ".html",
unlink => 0,
@@ -8754,6 +8760,7 @@
my $yaml = $resp->content;
# was fuer ein Umweg!
my $fh = File::Temp->new(
+ dir => File::Spec->tmpdir,
template => 'cpan_reports_XXXX',
suffix => '.yaml',
unlink => 0,
==== //depot/perl/lib/CPAN/Kwalify/distroprefs.dd#3 (text) ====
Index: perl/lib/CPAN/Kwalify/distroprefs.dd
--- perl/lib/CPAN/Kwalify/distroprefs.dd#2~30551~ 2007-03-12
08:12:39.000000000 -0700
+++ perl/lib/CPAN/Kwalify/distroprefs.dd 2007-04-25 04:00:34.000000000
-0700
@@ -1,5 +1,16 @@
$VAR1 = {
"mapping" => {
+ "comment" => {
+ "type" => "text"
+ },
+ "cpanconfig" => {
+ "mapping" => {
+ "=" => {
+ "type" => "text"
+ }
+ },
+ "type" => "map"
+ },
"disabled" => {
"enum" => [
0,
@@ -7,10 +18,31 @@
],
"type" => "int"
},
- "test" => {
+ "goto" => {
+ "type" => "text"
+ },
+ "install" => {
"mapping" => {
+ "args" => {
+ "sequence" => [
+ {
+ "type" => "text"
+ }
+ ],
+ "type" => "seq"
+ },
+ "commandline" => {
+ "type" => "text"
+ },
"eexpect" => {
"mapping" => {
+ "mode" => {
+ "enum" => [
+ "deterministic",
+ "anyorder"
+ ],
+ "type" => "text"
+ },
"talk" => {
"sequence" => [
{
@@ -21,13 +53,6 @@
},
"timeout" => {
"type" => "number"
- },
- "mode" => {
- "enum" => [
- "deterministic",
- "anyorder"
- ],
- "type" => "text"
}
},
"type" => "map"
@@ -40,14 +65,6 @@
},
"type" => "map"
},
- "args" => {
- "sequence" => [
- {
- "type" => "text"
- }
- ],
- "type" => "seq"
- },
"expect" => {
"sequence" => [
{
@@ -55,17 +72,22 @@
}
],
"type" => "seq"
- },
- "commandline" => {
- "type" => "text"
}
},
"type" => "map"
},
"make" => {},
- "install" => {},
"match" => {
"mapping" => {
+ "distribution" => {
+ "type" => "text"
+ },
+ "module" => {
+ "type" => "text"
+ },
+ "perl" => {
+ "type" => "text"
+ },
"perlconfig" => {
"mapping" => {
"=" => {
@@ -73,34 +95,10 @@
}
},
"type" => "map"
- },
- "perl" => {
- "type" => "text"
- },
- "module" => {
- "type" => "text"
- },
- "distribution" => {
- "type" => "text"
}
},
"type" => "map"
},
- "pl" => {},
- "comment" => {
- "type" => "text"
- },
- "cpanconfig" => {
- "mapping" => {
- "=" => {
- "type" => "text"
- }
- },
- "type" => "map"
- },
- "goto" => {
- "type" => "text"
- },
"patches" => {
"sequence" => [
{
@@ -108,10 +106,12 @@
}
],
"type" => "seq"
- }
+ },
+ "pl" => {},
+ "test" => {}
},
"type" => "map"
};
-$VAR1->{"mapping"}{"make"} = $VAR1->{"mapping"}{"test"};
-$VAR1->{"mapping"}{"install"} = $VAR1->{"mapping"}{"test"};
-$VAR1->{"mapping"}{"pl"} = $VAR1->{"mapping"}{"test"};
+$VAR1->{"mapping"}{"make"} = $VAR1->{"mapping"}{"install"};
+$VAR1->{"mapping"}{"pl"} = $VAR1->{"mapping"}{"install"};
+$VAR1->{"mapping"}{"test"} = $VAR1->{"mapping"}{"install"};
End of Patch.
