Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Confusing error when KAS applies patches with quilt #96

Open
lejcik opened this issue Apr 4, 2023 · 3 comments · May be fixed by #98
Open

Confusing error when KAS applies patches with quilt #96

lejcik opened this issue Apr 4, 2023 · 3 comments · May be fixed by #98

Comments

@lejcik
Copy link

lejcik commented Apr 4, 2023

Hi all,

I've got a confusing error when I tried to start KAS on my build system:

2023-04-03 15:05:45 - ERROR    - /src/myapp/myapp-build/patches/upstream-patches/meta-layer/quilt/
Traceback (most recent call last):
  File "/usr/local/lib/python3.8/dist-packages/kas/kas.py", line 165, in main
    sys.exit(kas(sys.argv[1:]))
  File "/usr/local/lib/python3.8/dist-packages/kas/kas.py", line 154, in kas
    plugin.run(args)
  File "/usr/local/lib/python3.8/dist-packages/kas/plugins/shell.py", line 100, in run
    macro.run(ctx, args.skip)
  File "/usr/local/lib/python3.8/dist-packages/kas/libcmds.py", line 99, in run
    command.execute(ctx)
  File "/usr/local/lib/python3.8/dist-packages/kas/libcmds.py", line 324, in execute
    repos_apply_patches(ctx.config.get_repos())
  File "/usr/local/lib/python3.8/dist-packages/kas/libkas.py", line 196, in repos_apply_patches
    if task.result():
  File "/usr/local/lib/python3.8/dist-packages/kas/repos.py", line 326, in apply_patches_async
    raise FileNotFoundError(p)
FileNotFoundError: /src/myapp/myapp-build/patches/upstream-patches/meta-layer/quilt/

It took me a while to find what does this error mean. FileNotFoundError is confusing, also the path .../quilt/ exists. The problem was with .../quilt/series file, as by mistake we've added an empty line to it. Its content is like here:

0001-my.patch\n
\n

KAS joins the .../quilt/ path with the patch file names that it reads from the series file. However, in the case the line is empty, it joins path with empty string, and tries to open it as a file, what fails on FileNotFoundError.

I'd suggest to add a condition that will ignore the empty lines, similarly as it does with # comments in repos.py:320:
if line.startswith('#'):

We are on the latest version: kas 3.2.3 (configuration format version 13, earliest compatible version 1)

BR,
Vilo
@henning-schild
Copy link
Contributor

I think i once wrote that code in question. Good catch! How about you send a patch to the mailinglist for that?

In the end it should behave like quilt does. So skip that empty line in case quilt would also skip. Or maybe stop there, or throw some sort of special error.

We also have test-cases which could be extended to have a series file with such an empty line, and assertions that we do "the right thing" as quilt users would expect.

@lejcik
Copy link
Author

lejcik commented Apr 5, 2023 •
edited
Loading

Thank you for a quick reaction.

Ok, I'll prepare a patch which will fix this issue, also I'll cover such case in the tests. I think this is nothing difficult also for a non-python developer 🙂

I'll be back in a few days, I need to find some spare time to do that. As suggested, I'll send the patch to the mailing list...

@henning-schild
Copy link
Contributor

Thanks for taking care! Feel free to cc me "[email protected]" when you send your patches to the list.

And thanks for the report already, it seems like a pitfall worth fixing.

lejcik added a commit to lejcik/siemens-kas that referenced this issue Apr 7, 2023
@lejcik
repos: improved parsing of the 'series' file with whitespaces
2025117 
When kas applies patches and the 'series' file contains an empty line or
whitespaces before comment, it fails on error FileNotFoundError, which has
nothing to do with a file operation, it's only a parsing issue.

This patch fixes issue with parsing the 'series' file. Moreover, test files
were updated to cover such case.

siemens#96

Signed-off-by: Viliam Lejcik <[email protected]>
@lejcik lejcik linked a pull request Apr 25, 2023 that will close this issue
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

repos: improved parsing of the 'series' file lejcik/siemens-kas
2 participants
@henning-schild @lejcik