MCPClient: check uploadDIP/ dir in Store DIP (Fixes #729) #741
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
qubot
force-pushed
the
dev/issue-11476-store-dip-failing
branch
from
c79dee9
to
ba97914
Compare
Closed
|
@nickwilkinson Can you find someone to CR this? |
nickwilkinson
requested review from
jraddaoui
and removed request for
nickwilkinson
qubot
force-pushed
the
dev/issue-11476-store-dip-failing
branch
from
ba97914
to
b82a9d9
Compare
|
I've rebased. |
sevein
requested changes
Oct 5, 2017
There was a problem hiding this comment.
@jrwdunham, I'ves tested it and it's working. 👍
I think the commit message could include the same description that you've added to the pull request, don't you think? I'd also like to ask you to change the subject line. We normally use the imperative mode and prefix the commit with the component being modified (e.g. MCPClient: ...).
qubot
force-pushed
the
dev/issue-11476-store-dip-failing
branch
2 times, most recently
from
740f98f
to
28ec05a
Compare
jrwdunham
changed the title
|
@sevein I changed the commit msg and the PR title and initial comment. Are we good to merge or were there changes requested on the code? |
sevein
approved these changes
Oct 5, 2017
If the user chooses "Do not upload DIP" at the "Upload DIP?" choice point, then the DIP will not be moved to the uploadedDIPs/ directory but will stay in its original location in uploadDIP/. However, the "Store DIP" micro-service expects the DIP to be in the uploadedDIPs/ directory. This changes the storeAIP.py micro-services so that if the aip_path does not exist, the path is modified so that the first uploadedDIPs/ directory in the AIP path is replaced by uploadDIP. Not the most elegant solution, but it works. Fixes #729.
qubot
force-pushed
the
dev/issue-11476-store-dip-failing
branch
from
28ec05a
to
62bf2e9
Compare
|
Rebased. I'm planning to merge. |
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.
If the user chooses "Do not upload DIP" at the "Upload DIP?" choice point, then the DIP will not be moved to the uploadedDIPs/ directory but will stay in its original location in uploadDIP/. However, the "Store DIP" micro-service expects the DIP to be in the uploadedDIPs/ directory. This changes the storeAIP.py micro-services so that if the aip_path does not exist, the path is modified so that the first uploadedDIPs/ directory in the AIP path is replaced by uploadDIP. Not the most elegant solution, but it works. Fixes #729.