summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-04-29 17:28:34 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-05-01 00:34:42 +0200
commit7446f94c052a40a5f21253b97a0fd36495ea7ed8 (patch)
tree958d1e7fad71c7e68f4570d3b316c7bfd024b511
parenta3ca950b17e99a3e61f1f2098866f321559c22cd (diff)
downloadurpmi-7446f94c052a40a5f21253b97a0fd36495ea7ed8.tar
urpmi-7446f94c052a40a5f21253b97a0fd36495ea7ed8.tar.gz
urpmi-7446f94c052a40a5f21253b97a0fd36495ea7ed8.tar.bz2
urpmi-7446f94c052a40a5f21253b97a0fd36495ea7ed8.tar.xz
urpmi-7446f94c052a40a5f21253b97a0fd36495ea7ed8.zip
do not skip network tests on pre-UsrMove distros
Eg: on Mageia 2, the network test would be skipped due to faulty test which caused us to think no downloader would be available
-rw-r--r--NEWS3
-rw-r--r--t/helper.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 5841d286..bcb74169 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- cpan_testers:
+ o do not skip network tests on pre-UsrMove distros (eg: Mageia 2)
+
Version 8.122 - 28 April 2020
- cpan_testers:
diff --git a/t/helper.pm b/t/helper.pm
index 950c3c65..74e0eb07 100644
--- a/t/helper.pm
+++ b/t/helper.pm
@@ -53,7 +53,7 @@ sub need_downloader() {
my @dl_helpers = qw(wget curl prozilla aria2c);
my $found;
foreach (@dl_helpers) {
- -e "/bin/$_" and $found = 1;
+ -e "/bin/$_" || -e "/usr/bin/$_" and $found = 1;
}
if (!$found) {
warn "SKIPing because we're missing a downloader. We need one of wget/curl/prozilla/aria2c";