Fix timezone::ntp_servers() when it is called more than once.

The old implementation of get_ntp_server_tree() would add entries
to %timezone for each leaf node it visited. So if ntp_servers() was
called a second time, it would list those spurious entries. Fixed by
stopping recursion immediately when a leaf node was found.

1 files changed, 7 insertions, 8 deletions

diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm
index faf769054..a18914755 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -150,14 +150,13 @@ our %ntp_servers;
 sub get_ntp_server_tree {
     my ($zone) = @_;
     map {
-        $ntp_servers{$zone}{$_} => (
-            exists $ntp_servers{$_} ?
-              $zone ?
-                translate($_) . "|" . N("All servers") :
-                N("All servers") :
-              translate($zone) . "|" . translate($_)
-        ),
-        get_ntp_server_tree($_);
+        my $key = $ntp_servers{$zone}{$_};
+        if (exists $ntp_servers{$_}) {
+            ( $key => $zone ? translate($_) . "|" . N("All servers") : N("All servers"),
+              get_ntp_server_tree($_) );
+        } else {
+            ( $key => translate($zone) . "|" . translate($_) );
+        }
     } keys %{$ntp_servers{$zone}};
 }