undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-remote-mediawiki: better error message when HTTP(S) access fails

Browse Source 
My use-case is an invalid SSL certificate. Pulling from the wiki with a
recent version of libwww-perl fails, and git-remote-mediawiki gave no
clue about the reason. Give the mediawiki API detailed error message, and
since it is not so informative, hint the user about an invalid SSL
certificate on https:// urls.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy 2013-05-29 14:06:29 +02:00 committed by Junio C Hamano
parent 92758dd2a2
commit 0aa0321212
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/mw-to-git/git-remote-mediawiki.perl
View File

@ -238,6 +238,22 @@ sub mw_connect_maybe {
} }
} }
sub fatal_mw_error {
my $action = shift;
print STDERR "fatal: could not $action.\n";
print STDERR "fatal: '$url' does not appear to be a mediawiki\n";
if ($url =~ /^https/) {
print STDERR "fatal: make sure '$url/api.php' is a valid page\n";
print STDERR "fatal: and the SSL certificate is correct.\n";
} else {
print STDERR "fatal: make sure '$url/api.php' is a valid page.\n";
}
print STDERR "fatal: (error " .
$mediawiki->{error}->{code} . ': ' .
$mediawiki->{error}->{details} . ")\n";
exit 1;
}
## Functions for listing pages on the remote wiki ## Functions for listing pages on the remote wiki
sub get_mw_tracked_pages { sub get_mw_tracked_pages {
my $pages = shift; my $pages = shift;
@ -290,10 +306,7 @@ sub get_mw_all_pages {
aplimit => 'max' aplimit => 'max'
}); });
if (!defined($mw_pages)) { if (!defined($mw_pages)) {
print STDERR "fatal: could not get the list of wiki pages.\n"; fatal_mw_error("get the list of wiki pages");
print STDERR "fatal: '$url' does not appear to be a mediawiki\n";
print STDERR "fatal: make sure '$url/api.php' is a valid page.\n";
exit 1;
} }
foreach my $page (@{$mw_pages}) { foreach my $page (@{$mw_pages}) {
$pages->{$page->{title}} = $page; $pages->{$page->{title}} = $page;
@ -316,10 +329,7 @@ sub get_mw_first_pages {
titles => $titles, titles => $titles,
}); });
if (!defined($mw_pages)) { if (!defined($mw_pages)) {
print STDERR "fatal: could not query the list of wiki pages.\n"; fatal_mw_error("query the list of wiki pages");
print STDERR "fatal: '$url' does not appear to be a mediawiki\n";
print STDERR "fatal: make sure '$url/api.php' is a valid page.\n";
exit 1;
} }
while (my ($id, $page) = each(%{$mw_pages->{query}->{pages}})) { while (my ($id, $page) = each(%{$mw_pages->{query}->{pages}})) {
if ($id < 0) { if ($id < 0) {