repos: improved parsing of the 'series' file #98
Conversation
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]>
| for line in f: | ||
| if line.startswith('#'): | ||
| ln += 1 | ||
| if not line.rstrip('\n') or line.startswith('#'): |
There was a problem hiding this comment.
condition with rstrip('\n') accepts empty lines \n, but not any whitespace on the line, e.g. \n
| continue | ||
| p = os.path.join(path, line.split(' #')[0].rstrip()) | ||
| pn = line.split(' #')[0].rstrip() | ||
| if not pn: |
There was a problem hiding this comment.
handle error if patch name pn is parsed as empty string
| self.name, | ||
| patch['id']) | ||
| return 1 | ||
| p = os.path.join(path, pn) | ||
| if os.path.isfile(p): |
There was a problem hiding this comment.
this line behaves strange on my linux with python ver. 3.10.7,
if pn contains space at the beginning (e.g. 001.patch), isfile() says that such path p exists, and error appears later when patch is about to be applied,
| pn = line.split(' #')[0].rstrip() | ||
| if not pn: | ||
| logging.error('Could not parse patch file name from a \'series\' file. ' | ||
| '(file: %s, line: %d, repo: %s, patch entry: %s)', |
There was a problem hiding this comment.
not sure if the error message is clear enough, or should it be rephrased?
|
MRs are not systematically reviewed by the community. I would recommend to follow up with a "v2" of your patch on the mailing list. |
|
What's the status of this proposal? |
fixes #96