From patchwork Tue Sep 27 16:48:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 6022 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4McQZ35QWYz3x0R for ; Tue, 27 Sep 2022 16:48:59 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4McQZ140hRz2YV; Tue, 27 Sep 2022 16:48:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4McQZ04lVmz30Vp; Tue, 27 Sep 2022 16:48:56 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4McQYz3lNkz2yVB for ; Tue, 27 Sep 2022 16:48:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4McQYz2PCQzwd; Tue, 27 Sep 2022 16:48:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1664297335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fbPMy9QxuiOU4a661eQnAq8zHvDZ7dAn/vojYgeGKA0=; b=nnob2XeM4QoeJb9dK+9Da9p/DSGTJFMLUVb25ChH1/eknSAHzyvCjXuOZX3Q/tW8VZbPf3 hx6Zg8p1epyNWaDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1664297335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fbPMy9QxuiOU4a661eQnAq8zHvDZ7dAn/vojYgeGKA0=; b=svTE4Vg9ey2dw7k/cShAYE5gpGnk3Ne7MDpaxHqJTaNNDEU1EKtVIltCnhsQDgg8QNlEsK d/hcHhfCHgeUzmXpUzzRGxX67b9fs8ETwpKPvDYCo9l/ZcUJaMxPg9Q2KRDGTHn5Jvyd2L oTAql/JPWH6zMISuzd6o8Bz2q5N5AtCPSx3rVnR7AtNW7/d7TJNhhWApwviS6+nVLW+9lk TJZrXXjPYAyHFbl0c0vCzeW1OXnVwi6gsTe5/zfeaoFsZfAHnUh3uU2mhRC5WUOElTzLcT KnORewEV+Cn/4dQvZpthavWjtIlKwTleE/0ZUPwcVHXvKz0YYBwdvhbWLUgpUA== From: Michael Tremer To: location@lists.ipfire.org Subject: [PATCH 08/10] importer: Fix reading Geofeeds from remarks Date: Tue, 27 Sep 2022 16:48:45 +0000 Message-Id: <20220927164847.3409646-8-michael.tremer@ipfire.org> In-Reply-To: <20220927164847.3409646-1-michael.tremer@ipfire.org> References: <20220927164847.3409646-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: location@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: location-bounces@lists.ipfire.org Sender: "Location" Only RIPE has a dedicated geofeed field. For others, this data needs to be read from the remarks section. Signed-off-by: Michael Tremer --- src/scripts/location-importer.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/location-importer.in b/src/scripts/location-importer.in index 7e2136e..0e2764e 100644 --- a/src/scripts/location-importer.in +++ b/src/scripts/location-importer.in @@ -863,8 +863,8 @@ class CLI(object): inetnum["geofeed"] = val # Parse geofeed when used as a remark - elif key == "remark": - m = re.match(r"^(?:geofeed|Geofeed)\s+(https://.*)", val) + elif key == "remarks": + m = re.match(r"^(?:Geofeed)\s+(https://.*)", val) if m: inetnum["geofeed"] = m.group(1)