Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update a dependency MHonArc #1004

Merged
merged 2 commits into from
Nov 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpanfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.24';

# Required to compute digest for password and emails
requires 'MIME::Base64', '>= 3.03';
Expand Down
17 changes: 4 additions & 13 deletions src/sbin/sympa_wizard.pl.in
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down