From 80de4d8a41a87af42dd71cb2e8456340f1113bd2 Mon Sep 17 00:00:00 2001
From: Juerg Haefliger <juerg.haefliger@canonical.com>
Date: Fri, 1 Sep 2023 08:52:24 +0200
Subject: [PATCH] check_whence: Recognize RawFile keyword
WHENCE and copy_firmware.sh now support a new keyword RawFile to list
files that must not be compressed. Update check_whence.py to recognize
that.
Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: Josh Boyer <jwboyer@kernel.org>
---
check_whence.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/check_whence.py b/check_whence.py
index db6ac0f5..7e0a04f9 100755
--- a/check_whence.py
+++ b/check_whence.py
@@ -7,11 +7,11 @@ from io import open
def list_whence():
with open("WHENCE", encoding="utf-8") as whence:
for line in whence:
- match = re.match(r'(?:File|Source):\s*"(.*)"', line)
+ match = re.match(r'(?:RawFile|File|Source):\s*"(.*)"', line)
if match:
yield match.group(1)
continue
- match = re.match(r"(?:File|Source):\s*(\S*)", line)
+ match = re.match(r"(?:RawFile|File|Source):\s*(\S*)", line)
if match:
yield match.group(1)
continue
@@ -35,7 +35,7 @@ def list_whence():
def list_whence_files():
with open("WHENCE", encoding="utf-8") as whence:
for line in whence:
- match = re.match(r"File:\s*(.*)", line)
+ match = re.match(r"(?:RawFile|File):\s*(.*)", line)
if match:
yield match.group(1).replace("\ ", " ").replace('"', "")
continue
--
GitLab