Merge remote branch 'upstream/master' into prv/po

Conflicts:
	doc/plugins/po.mdwn

1 files changed, 5 insertions, 2 deletions

diff --git a/t/mercurial.t b/t/mercurial.t
index b64ea8e56..4918fc76e 100755
--- a/t/mercurial.t
+++ b/t/mercurial.t
@@ -6,11 +6,14 @@ BEGIN {
 	$dir = "/tmp/ikiwiki-test-hg.$$";
 	my $hg=`which hg`;
 	chomp $hg;
-	if (! -x $hg || ! mkdir($dir)) {
+	if (! -x $hg) {
 		eval q{
-			use Test::More skip_all => "hg not available or could not make test dir"
+			use Test::More skip_all => "hg not available"
 		}
 	}
+	if (! mkdir($dir)) {
+		die $@;
+	}
 }
 use Test::More tests => 11;