diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-04-28 23:37:37 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-04-29 16:16:24 +0200 |
| commit | 44c6a113c02ec00dca037c15fac370207afb60a5 (patch) | |
| tree | 6d1a7fa4632d2850842e2107833462ac4f4dcab4 | |
| parent | 0c1f6d163dacc6dfcc428424558e2bbd88d485b0 (diff) | |
| download | urpmi-44c6a113c02ec00dca037c15fac370207afb60a5.tar urpmi-44c6a113c02ec00dca037c15fac370207afb60a5.tar.gz urpmi-44c6a113c02ec00dca037c15fac370207afb60a5.tar.bz2 urpmi-44c6a113c02ec00dca037c15fac370207afb60a5.tar.xz urpmi-44c6a113c02ec00dca037c15fac370207afb60a5.zip | |
do not restrict PATH during testsuite
(needed for next commit)
| -rw-r--r-- | t/helper.pm | 2 | ||||
| -rwxr-xr-x | urpmi.addmedia | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/t/helper.pm b/t/helper.pm index 841b57e6..c06d1202 100644 --- a/t/helper.pm +++ b/t/helper.pm @@ -98,10 +98,12 @@ sub urpmi_cmd() { urpm_cmd('urpmi') } sub urpmi_addmedia { my ($para) = @_; + $ENV{URPMI_TESTSUITE} = 1; system_(urpm_cmd('urpmi.addmedia --no-verify-rpm') . " $para"); } sub urpmi_addmedia_should_retry { my ($para) = @_; + $ENV{URPMI_TESTSUITE} = 1; system_should_retry(urpm_cmd('urpmi.addmedia --no-verify-rpm') . " $para"); } sub urpmi_removemedia { diff --git a/urpmi.addmedia b/urpmi.addmedia index fc26028d..8b4d08f9 100755 --- a/urpmi.addmedia +++ b/urpmi.addmedia @@ -86,7 +86,7 @@ and [options] are from exit 1; } -$ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin"; +$ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin" if !$ENV{URPMI_TESTSUITE}; delete @ENV{qw(ENV BASH_ENV IFS CDPATH)}; $options{force} = 0; |