-
Notifications
You must be signed in to change notification settings - Fork 231
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.
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
Fix the permissions for (re)created resultdir #1468
Merged
praiskup
merged 2 commits into
rpm-software-management:main
from
praiskup:praiskup-resultdir-permissions
Sep 26, 2024
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ | |
|
||
# our imports | ||
from mockbuild.trace_decorator import getLog, traceLog | ||
from mockbuild import file_util, util | ||
from mockbuild import util | ||
|
||
requires_api_version = "1.1" | ||
|
||
|
@@ -56,7 +56,7 @@ def __scanChroot(self): | |
regexstr = "|".join(self.scan_opts['regexes']) | ||
regex = re.compile(regexstr) | ||
chroot = self.buildroot.make_chroot_path() | ||
file_util.mkdirIfAbsent(self.resultdir) | ||
self.buildroot.create_resultdir() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Argh! While it was causing issues before, now it is broken even more -> because |
||
count = 0 | ||
logger = getLog() | ||
logger.debug("chroot_scan: Starting scan of %s", chroot) | ||
|
5 changes: 5 additions & 0 deletions
5
releng/release-notes-next/unified-resultdir-preparation.bugfix
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
Several internal code locations attempt to ensure that the result directory | ||
exists, creating it if necessary. However, these locations handled it | ||
inconsistently, sometimes neglecting to [change the ownership][issue#1467] of | ||
the result directory. Now, all locations use a single method dedicated to | ||
result directory preparation. |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Uff. I'm not sure about this. But yeah, in theory it should not be needed. Let be brave and do it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mock/mock/py/mockbuild/buildroot.py
Lines 627 to 632 in 8122bda
This is the force=True case, I think we are safe.