Update a dependency MHonArc::UTF8. See also sympa-community/MHonArc#7

igoltz · Nov 13, 2020 · 3121748 · 3121748
1 parent 2e03ac8
commit 3121748
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/cpanfile b/cpanfile
@@ -96,7 +96,7 @@ requires 'List::Util::XS', '>= 1.20';
 requires 'Locale::Messages', '>= 1.20';
 
 # MHonArc is used to build Sympa web archives
-requires 'MHonArc::UTF8';
+requires 'MHonArc::UTF8', '>= 2.6.23';
 
 # Required to compute digest for password and emails
 requires 'MIME::Base64', '>= 3.03';

diff --git a/src/sbin/sympa_wizard.pl.in b/src/sbin/sympa_wizard.pl.in
@@ -554,20 +554,11 @@ sub check_modules {
             print gettext('was not found on this system.') . "\n";
             install_module($mod, {'default' => $default}, $cpan_modules);
         } else {
-
             my ($vs, $v);
-
-            ## MHonArc module does not provide its version the standard way
-            if ($mod =~ /^MHonArc/i) {
-                require "mhamain.pl";
-                $v = $mhonarc::VERSION;
-            } else {
-
-                $vs = "$mod" . "::VERSION";
-                {
-                    no strict 'refs';
-                    $v = $$vs;
-                }
+            $vs = "$mod" . "::VERSION";
+            {
+                no strict 'refs';
+                $v = $$vs;
             }
 
             my $rv = $cpan_modules->{$mod}{required_version} || "1.0";