Fix rejected directory settings #1873
Merged
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
This replaces the `%%sharedPath%%` part of the rejected directory settings with the absolute path to the shared directory which matches all the other shared directory related settings.
replaceafill
added
AMAUAT
sevein
approved these changes
Nov 17, 2023
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.
The rejected directory settings are the only ones that use an interpolated variable (i.e.
%sharedPath%). Their%%part was escaped by the old SafeConfigParser and converted into a single%making them work in the MCPServer.This broke when the config parser base was replaced with the RawConfigParser which doesn't escape the double
%%anymore making the MCPServer to interpolate the value as%/var/archivematica/sharedDirectory/rejected%.We could rewrite the default value of the settings to be
rejectedDirectory = %sharedPath%rejectedand that would work fine, but the rest of the shared directory related settings don't use any interpolated variables. They point to the absolute path of the shared directory.So, this replaces the
%%sharedPath%%part of the rejected directory settings with the absolute path to the shared directory to make them match with the rest.Connected to archivematica/Issues#1636