concert: Fix merge errors #531
Open
Conversation
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
|
Added |
tfarago
reviewed
Jan 18, 2024
| @@ -91,27 +91,37 @@ def write_libtiff(file_name, data): | |||
| return file_name | |||
|
|
|||
|
|
|||
| def create_directory(directory, rights="750"): | |||
There was a problem hiding this comment.
It should be this, not 0o0750.
tfarago
reviewed
Jan 18, 2024
| writer: Type[TiffWriter] = TiffWriter, | ||
| prefix: str = "image_{:>05}.tif", | ||
| start_index: int = 0, | ||
| bytes_per_file=0) -> int: |
There was a problem hiding this comment.
Rights should make it back into the parameters.
tfarago
reviewed
Jan 18, 2024
| @@ -125,7 +135,7 @@ def write_images(pqueue, writer=TiffWriter, prefix="image_{:>05}.tif", start_ind | |||
| im_writer = writer(prefix, bytes_per_file, append=True) | |||
|
|
|||
| if dir_name and not os.path.exists(dir_name): | |||
| create_directory(dir_name, rights=rights) | |||
| create_directory(dir_name) | |||
There was a problem hiding this comment.
We want the rights here as well.
tfarago
reviewed
Jan 18, 2024
| @@ -369,7 +379,7 @@ async def __ainit__(self, | |||
|
|
|||
| async def _descend(self, name: str) -> None: | |||
| new = os.path.join(self._current, name) | |||
| create_directory(new, rights=self._rights) | |||
| create_directory(new) | |||
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.
Premise: Fixes the errors introduced during merge of decentralized to master. Verified with session tests.