From: lpsolit%gmail.com <>
Date: Thu, 19 Feb 2009 22:52:47 +0000 (+0000)
Subject: Bug 479228: Duplicated words in the error message in importxml.pl when the default... 
X-Git-Tag: bugzilla-3.2.3~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff6be69a6436f7b49bd2f389e3a319e03ece7a09;p=thirdparty%2Fbugzilla.git

Bug 479228: Duplicated words in the error message in importxml.pl when the default product or component doesn't exist - Patch by Frédéric Buclin <LpSolit@gmail.com> r=ghendricks a=LpSolit
---

diff --git a/importxml.pl b/importxml.pl
index d24c1ee1c1..24eff8f635 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -326,19 +326,17 @@ sub init() {
     Error( "no urlbase set", "REOPEN", $exporter ) unless ($urlbase);
     my $def_product =
         new Bugzilla::Product( { name => $params->{"moved-default-product"} } )
-        || Error("Cannot import these bugs because an invalid default 
-                  product was defined for the target db."
-                  . $params->{"maintainer"} . " needs to fix the definitions of
-                  moved-default-product. \n", "REOPEN", $exporter);
+        || Error("an invalid default product was defined for the target DB. " .
+                  $params->{"maintainer"} . " needs to fix the definitions of " .
+                 "moved-default-product. \n", "REOPEN", $exporter);
     my $def_component = new Bugzilla::Component(
         {
             product => $def_product,
             name    => $params->{"moved-default-component"}
         })
-    || Error("Cannot import these bugs because an invalid default 
-              component was defined for the target db."
-              . $params->{"maintainer"} . " needs to fix the definitions of
-              moved-default-component.\n", "REOPEN", $exporter);
+    || Error("an invalid default component was defined for the target DB. " .
+             $params->{"maintainer"} . " needs to fix the definitions of " .
+             "moved-default-component.\n", "REOPEN", $exporter);
 }
     
 
@@ -1359,7 +1357,7 @@ importxml - Import bugzilla bug data from xml.
  Options:
        -? --help        brief help message
        -v --verbose     print error and debug information. 
-                        Mulltiple -v increases verbosity
+                        Multiple -v increases verbosity
        -m --sendmail    send mail to recipients with log of bugs imported
        --attach_path    The path to the attachment files.
                         (Required if encoding="filename" is used for attachments.)