Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / src / pakfire / lib / functions.pl

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 0d8e8af3762bffb5c4e6cd685e1120182974cd5e..c47ff39bbdba48cc196b8b703ee8919c5c5e3d78 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -324,7 +324,12 @@ sub selectmirror {
                                $proto = $templine[0];
                                $host = $templine[1];
                                $path = $templine[2];
-                               if (pinghost("$host")) {
+                               if ($pakfiresettings{'HEALTHCHECK'} eq "off") {
+                                       logger("PING INFO: Healthcheck is disabled");
+                                       $found = 1;
+                                       return ($proto, $host, $path);
+                               }
+                               elsif (pinghost("$host")) {
                                        $found = 1;
                                        return ($proto, $host, $path);
                                }