From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Tue, 26 Oct 2010 21:07:30 +0000 (-0700)
Subject: Bug 607083: Improve the error message that install-module.pl prints when
X-Git-Tag: bugzilla-4.1.1~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=208390143d1c86d7cdb2f7ef51a9cedbc858ccff;p=thirdparty%2Fbugzilla.git

Bug 607083: Improve the error message that install-module.pl prints when
you specify an invalid CPAN module.
r=mkanat, a=mkanat (module owner)
---

diff --git a/Bugzilla/Install/CPAN.pm b/Bugzilla/Install/CPAN.pm
index 0ef003d69c..20cdb5bbd5 100644
--- a/Bugzilla/Install/CPAN.pm
+++ b/Bugzilla/Install/CPAN.pm
@@ -147,6 +147,9 @@ sub install_module {
     }
 
     my $module = CPAN::Shell->expand('Module', $name);
+    if (!$module) {
+        die install_string('no_such_module', { module => $name }) . "\n";
+    }
     print install_string('install_module', 
               { module => $name, version => $module->cpan_version }) . "\n";
     if ($test) {
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 889bb12b26..c786ef36b2 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -311,6 +311,7 @@ EOT
     module_not_found => "not found",
     module_ok => 'ok',
     module_unknown_version => "found unknown version",
+    no_such_module => "There is no Perl module on CPAN named ##module##.",
     mysql_innodb_disabled => <<'END',
 InnoDB is disabled in your MySQL installation.
 Bugzilla requires InnoDB to be enabled.