Fix read_files.sh for Factory/base #308
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
followup from #307
foursixnine
reviewed
Jul 30, 2025
foursixnine
approved these changes
Jul 30, 2025
d3flex
reviewed
Jul 30, 2025
| else: | ||
| repopath = ( | ||
| self.ag.productrepopath() + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix | ||
| ) |
There was a problem hiding this comment.
Suggested change
| ) | |
| if "/" in self.folder: | |
| prd_path = self.ag.productpath | |
| else: | |
| prd_path = self.ag.productrepopath() | |
| glob_pattern = f"*{repodir.attrib['folder']}*{suffix}" | |
| repopath = (os.path.join(prd_path, self.folder, glob_pattern)) |
I think this reduce the duplication
okurz
reviewed
Jul 30, 2025
Comment on lines
+662
to
+668
| repopath = "" | ||
| if "/" in self.folder: | ||
| repopath = self.ag.productpath + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix | ||
| else: | ||
| repopath = ( | ||
| self.ag.productrepopath() + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix | ||
| ) |
There was a problem hiding this comment.
Suggested change
| repopath = "" | |
| if "/" in self.folder: | |
| repopath = self.ag.productpath + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix | |
| else: | |
| repopath = ( | |
| self.ag.productrepopath() + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix | |
| ) | |
| repopath = self.ag.productpath + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix if "/" in self.folder else ( self.ag.productrepopath() + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix ) |
wrapped accordingly of course. Probably easier to read if written like this
Suggested change
| repopath = "" | |
| if "/" in self.folder: | |
| repopath = self.ag.productpath + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix | |
| else: | |
| repopath = ( | |
| self.ag.productrepopath() + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix | |
| ) | |
| suffix_path = "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix | |
| repopath = self.ag.productpath + suffix_path if "/" in self.folder else self.ag.productrepopath() + suffix_path |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
followup from #307