Skip to content

Commit cb60c0b

Browse files
committed
Nicer debug output when git tags are confused
1 parent f72fe4d commit cb60c0b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/lib/NQP/Configure.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ sub parse_revision {
5050
my $what = shift;
5151
my $sep = qr/[_.]/;
5252
$rev =~ /(\d+)$sep(\d+)(?:$sep(\d+))?(?:-(\d+)-g[a-f0-9]*)?$/
53-
or die "Unrecognized revision specifier '$rev' $what\n";
53+
or die "Unrecognized revision specifier '$rev' from $what\n";
5454
return ($1, $2, $3 || 0, $4 || 0);
5555
}
5656

@@ -226,7 +226,7 @@ sub gen_nqp {
226226
$impls{$b}{bin} = $bin;
227227
my %c = read_config($bin);
228228
my $nqp_have = $c{'nqp::version'} || '';
229-
my $nqp_ok = $nqp_have && cmp_rev($nqp_have, $nqp_want, "nqp") >= 0;
229+
my $nqp_ok = $nqp_have && cmp_rev($nqp_have, $nqp_want, "NQP") >= 0;
230230
if ($nqp_ok) {
231231
$impls{$b}{config} = \%c;
232232
}
@@ -289,7 +289,7 @@ sub gen_moar {
289289
$moar_have = $moar_version_output =~ /version (\S+)/ ? $1 : undef;
290290
}
291291

292-
my $moar_ok = $moar_have && cmp_rev($moar_have, $moar_want, "moar") >= 0;
292+
my $moar_ok = $moar_have && cmp_rev($moar_have, $moar_want, "MoarVM") >= 0;
293293
if ($moar_ok) {
294294
push @errors, "Found $moar_exe version $moar_have, which is new enough.\n";
295295
return ($moar_exe, @errors);

0 commit comments

Comments
 (0)