From: Steve Peters <steve@fisharerojo.org>
Date: Wed, 25 Apr 2007 11:00:34 +0000 (+0000)
Subject: Upgrade to CPAN-1.9101
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=917f17002097ee577163787c18abe1a911b23f4e;p=p5sagit%2Fp5-mst-13.2.git

Upgrade to CPAN-1.9101

p4raw-id: //depot/perl@31072
---

diff --git a/lib/CPAN.pm b/lib/CPAN.pm
index 60d7890..ca18eff 100644
--- a/lib/CPAN.pm
+++ b/lib/CPAN.pm
@@ -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 @@ sub format_result {
         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 @@ sub reanimate_build_dir {
             # $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 @@ Could not fork '$html_converter $saved_file': $!});
             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 @@ sub _getsave_url {
     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 @@ sub reports {
     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,
diff --git a/lib/CPAN/Kwalify/distroprefs.dd b/lib/CPAN/Kwalify/distroprefs.dd
index 2da6d63..392c821 100644
--- a/lib/CPAN/Kwalify/distroprefs.dd
+++ b/lib/CPAN/Kwalify/distroprefs.dd
@@ -1,5 +1,16 @@
 $VAR1 = {
   "mapping" => {
+    "comment" => {
+      "type" => "text"
+    },
+    "cpanconfig" => {
+      "mapping" => {
+        "=" => {
+          "type" => "text"
+        }
+      },
+      "type" => "map"
+    },
     "disabled" => {
       "enum" => [
         0,
@@ -7,10 +18,31 @@ $VAR1 = {
       ],
       "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 @@ $VAR1 = {
             },
             "timeout" => {
               "type" => "number"
-            },
-            "mode" => {
-              "enum" => [
-                "deterministic",
-                "anyorder"
-              ],
-              "type" => "text"
             }
           },
           "type" => "map"
@@ -40,14 +65,6 @@ $VAR1 = {
           },
           "type" => "map"
         },
-        "args" => {
-          "sequence" => [
-            {
-              "type" => "text"
-            }
-          ],
-          "type" => "seq"
-        },
         "expect" => {
           "sequence" => [
             {
@@ -55,17 +72,22 @@ $VAR1 = {
             }
           ],
           "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 @@ $VAR1 = {
             }
           },
           "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 @@ $VAR1 = {
         }
       ],
       "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"};