From: Tom Hughes <tom@compton.nu>
Date: Wed, 26 Sep 2018 21:43:30 +0000 (+0100)
Subject: Stop wiki update script trying to be "helpful"
X-Git-Tag: live~3824
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6d68c0b22d5822cba0ccea5ea46e540e6843e99e?ds=sidebyside

Stop wiki update script trying to be "helpful"

Instead of trying to advise how to import some (but not all) of
the modules, just require them in the normal way.

Closes #1763
---

diff --git a/script/misc/update-wiki-pages b/script/misc/update-wiki-pages
index 84e1e8a1c..3f15c0df0 100755
--- a/script/misc/update-wiki-pages
+++ b/script/misc/update-wiki-pages
@@ -3,20 +3,11 @@ use 5.010;
 use strict;
 use warnings;
 
-use Pod::Usage ();
-use Getopt::Long ();
-
-BEGIN {
-    eval "require MediaWiki::API; require YAML::XS;" or do {
-        print "You have to install some modules via CPAN to run this:\n";
-        print "   sudo cpanp MediaWiki::API YAML::XS\n";
-        exit 1;
-    };
-}
-
+use Getopt::Long;
+use Pod::Usage;
 use MediaWiki::API;
+use Test::More qw(no_plan);
 use YAML::XS qw(Dump);
-use Test::More 'no_plan';
 
 =head1 NAME