Skip to contentSkip to conversation

oeqa/core/loader: fix regex to include numbers

PATCH Vacek, Patrick 2 participants 2 messages Jul 6, 2020 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

I think I need some help here. I got an automated email that my patch failed to apply, supposedly because I need to rebase. I'm on the same commit that it is suggested to rebase to, though, and I can download the patch and apply it without any problems. What am I doing wrong here?

Thanks,
Patrick

Quoted 28 lines · Patrick via lists.openembedded.org

The previous version only included the numbers 1 and 2 in the allowed characters
for the module name. In the past, this was (\w+) so all numbers were allowed. Now it explicitly includes all numbers again.

---
 meta/lib/oeqa/core/loader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/core/loader.py +1 -1
index 73c5788508..11978213b8 100644
@@ -46,7 +46,7 @@ def _built_modules_dict(modules):
     for module in modules:
         # Assumption: package and module names do not contain upper case
         # characters, whereas class names do
-        m = re.match(r'^([1-2a-z_.]+)(?:\.(\w[^.]*)(?:\.([^.]+))?)?$',
 module, flags=re.ASCII)
+        m = re.match(r'^([0-9a-z_.]+)(?:\.(\w[^.]*)(?:\.([^.]+))?)?$',
 module, flags=re.ASCII)
         if not m:

continue

--
2.27.0

#2 lore raw
Quoted 4 lines · Patrick via lists.openembedded.org

I think I need some help here. I got an automated email that my patch failed to apply, supposedly because I need to rebase. I'm on the same commit that it is suggested to rebase to, though, and I can download the patch and apply it without any problems. What am I doing wrong here?

The patch is queued in -next, I think the automated tests are lagging behind a bit or something :/.

Cheers,

Richard