From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 420011FF187 for ; Mon, 22 Sep 2025 12:33:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 58BB317FBB; Mon, 22 Sep 2025 12:34:05 +0200 (CEST) Mime-Version: 1.0 Date: Mon, 22 Sep 2025 12:33:31 +0200 Message-Id: To: "Shannon Sterz" From: "Christoph Heiss" X-Mailer: aerc 0.21.0 References: <20250922090855.58508-2-s.sterz@proxmox.com> <20250922090855.58508-4-s.sterz@proxmox.com> In-Reply-To: <20250922090855.58508-4-s.sterz@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758537199963 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.037 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH installer v2 2/3] country.pl: remove generating mirror information X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Cc: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" On Mon Sep 22, 2025 at 11:08 AM CEST, Shannon Sterz wrote: > this is no longer needed, as we don't rely on this information in the > installer anymore. `proxmox-auto-installer/tests/resources/locales.json` can/should also be updated correspondingly. Although it doesn't cause any errors (since we ignore unknown fields when deserializing), keeping it in sync would still be good. > > Suggested-by: Fiona Ebner > Signed-off-by: Shannon Sterz > --- > country.pl | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/country.pl b/country.pl > index 227eba4..be760bb 100755 > --- a/country.pl > +++ b/country.pl > @@ -8,23 +8,20 @@ use JSON qw(from_json to_json); > > # Generates a > # > -# - country code => name/kmap/mirror > # - name => country code > # > # mapping for each defined country > my sub generate_country_mappings { > - my ($country_codes, $defmap, $mirrors) = @_; > + my ($country_codes, $defmap) = @_; > > my ($countries, $countryhash) = ({}, {}); > foreach my $cc (sort keys %$country_codes) { > my $name = $country_codes->{$cc}; > my $kmap = $defmap->{$cc} || ''; > - my $mirror = $mirrors->{$cc} || ''; > > $countries->{$cc} = { > name => $name, > kmap => $kmap, > - mirror => $mirror, > }; > $countryhash->{ lc($name) } = $cc; > } > @@ -124,12 +121,7 @@ my $defmap = { > 'li' => 'de-ch', > }; > > -my $mirrors = PVE::Tools::debmirrors(); > -foreach my $cc (keys %$mirrors) { > - die "undefined country code '$cc'" if !defined($country_codes->{$cc}); > -} > - > -my ($countries, $countryhash) = generate_country_mappings($country_codes, $defmap, $mirrors); > +my ($countries, $countryhash) = generate_country_mappings($country_codes, $defmap); > my ($kmap, $kmaphash) = generate_keymaps($country_codes); > my ($zones, $cczones) = parse_zoneinfo($countries); > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel