diff mbox series

[v5,1/6] wic: extra-partition: Small code cleanup

Message ID 20260116093215.26108-1-adam.duskett@amarulasolutions.com
State New
Headers show
Series [v5,1/6] wic: extra-partition: Small code cleanup | expand

Commit Message

Adam Duskett Jan. 16, 2026, 9:32 a.m. UTC 
- Remove redundant charachter escaped in the src_entry regex call.
- Remove an uneeded semicolon for cls.install_task.
- we copies -> we copy

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 scripts/lib/wic/plugins/source/extra_partition.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Antonin Godard Jan. 19, 2026, 8:55 a.m. UTC | #1 
Hi,

Sorry, this conflicts with another series from Louis right now which has passed
testing:
https://lore.kernel.org/r/20260112-extrafiles-v2-0-67f0f6c37c4e@non.se.com

I cannot apply your patches on top for now. As it's still undecided whether
these will make it to master, you can wait a while before rebasing your
series, or rebase now if you want me to run your patches in our test infra.

Regards,
Antonin
diff mbox series

Patch

diff --git a/scripts/lib/wic/plugins/source/extra_partition.py b/scripts/lib/wic/plugins/source/extra_partition.py
index d370b0107e..a1d9aa9a7b 100644
--- a/scripts/lib/wic/plugins/source/extra_partition.py
+++ b/scripts/lib/wic/plugins/source/extra_partition.py
@@ -69,7 +69,7 @@  class ExtraPartitionPlugin(SourcePlugin):
 
         # list of tuples (src_name, dst_name)
         deploy_files = []
-        for src_entry in re.findall(r'[\w;\-\./\*]+', extra_files):
+        for src_entry in re.findall(r'[\w;\-./*]+', extra_files):
             if ';' in src_entry:
                 dst_entry = tuple(src_entry.split(';'))
                 if not dst_entry[0] or not dst_entry[1]:
@@ -80,7 +80,7 @@  class ExtraPartitionPlugin(SourcePlugin):
             logger.debug('Destination entry: %r', dst_entry)
             deploy_files.append(dst_entry)
 
-        cls.install_task = [];
+        cls.install_task = []
         for deploy_entry in deploy_files:
             src, dst = deploy_entry
             if '*' in src:
@@ -111,7 +111,7 @@  class ExtraPartitionPlugin(SourcePlugin):
         """
         Called to do the actual content population for a partition i.e. it
         'prepares' the partition to be incorporated into the image.
-        In this case, we copies all files listed in IMAGE_EXTRA_PARTITION_FILES variable.
+        In this case, we copy all files listed in IMAGE_EXTRA_PARTITION_FILES variable.
         """
         extradir = "%s/extra.%d" % (cr_workdir, part.lineno)