Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
blah
  • Loading branch information
samcv committed Apr 3, 2017
1 parent e5f9b82 commit 097acbf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tools/lib/NQP/Configure.pm
Expand Up @@ -6,9 +6,9 @@ use File::Copy qw(copy);

use base qw(Exporter);
our @EXPORT_OK = qw(sorry slurp system_or_die
cmp_rev
cmp_rev
read_config
fill_template_file fill_template_text
fill_template_file fill_template_text
git_checkout
verify_install gen_moar
github_url
Expand Down Expand Up @@ -175,7 +175,7 @@ sub git_checkout {

if ($checkout) {
system_or_die('git', 'checkout', $checkout);
system_or_die('git', 'pull')
system_or_die('git', 'pull')
if slurp('.git/HEAD') =~ /^ref:/;
}

Expand Down Expand Up @@ -285,7 +285,7 @@ sub gen_moar {
: File::Spec->catfile( $prefix, 'bin', "moar$exe" ));
my $moar_version_output = qx{ $moar_exe --version };
if ($moar_version_output) {
$moar_have = $moar_have =~ /version (\S+)/ ? $1 : undef;
$moar_have = $moar_version_output =~ /version (\S+)/ ? $1 : undef;
}

my $moar_ok = $moar_have && cmp_rev($moar_have, $moar_want) >= 0;
Expand Down

1 comment on commit 097acbf

@samcv
Copy link
Collaborator Author

@samcv samcv commented on 097acbf Apr 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was meant to be a part of the previous commit, and fixes a swapped variable in the previous commit's error handling.

Please sign in to comment.