Skip to content

Commit

Permalink
fix two conditions
Browse files Browse the repository at this point in the history
* one is now always true because it is an object
* the other was checking the definedness of lhs instead of rhs
  • Loading branch information
rjbs committed Aug 8, 2015
1 parent b74424d commit 4e5adf0
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions lib/Dist/Zilla/Tester.pm
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ sub minter { 'Dist::Zilla::Tester::_Minter' }

local $ENV{DZIL_GLOBAL_CONFIG_ROOT};
$ENV{DZIL_GLOBAL_CONFIG_ROOT} = $tester_arg->{global_config_root}
if defined $ENV{DZIL_GLOBAL_CONFIG_ROOT};
if defined $tester_arg->{global_config_root};

my $zilla = $self->$orig($arg);

Expand Down Expand Up @@ -276,9 +276,7 @@ sub minter { 'Dist::Zilla::Tester::_Minter' }

my $global_config_root = Path::Class::dir($tester_arg->{global_config_root})->absolute;

local $ENV{DZIL_GLOBAL_CONFIG_ROOT};
$ENV{DZIL_GLOBAL_CONFIG_ROOT} = $tester_arg->{global_config_root}
if defined $ENV{DZIL_GLOBAL_CONFIG_ROOT};
local $ENV{DZIL_GLOBAL_CONFIG_ROOT} = $global_config_root;

my $global_stashes = $self->_setup_global_config(
$global_config_root,
Expand Down

0 comments on commit 4e5adf0

Please sign in to comment.