Try relpath first, if failed use the user specified path #1337
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
For compatibility with Windows. relpath() fails when the specified path is on a different drive.
feldschlachtiv
changed the title
sanathkr
suggested changes
Aug 21, 2019
samcli/commands/build/command.py
Outdated
| output_template_path = os.path.relpath(ctx.output_template_path) | ||
| except ValueError: | ||
| LOG.debug("Failed to retrieve relpath - using abspath instead") | ||
| build_dir = os.path.abspath(ctx.build_dir) |
There was a problem hiding this comment.
Since we got a ValueError computing relative path, I would just use the original path without computing absolute path.
samcli/commands/build/command.py
Outdated
| # under Windows, when SAM and (build_dir or output_template_path) are | ||
| # on different drive, relpath() fails. | ||
| try: | ||
| build_dir = os.path.relpath(ctx.build_dir) |
There was a problem hiding this comment.
nit: can you rename build_dir and output_template_path to be something more descriptive? I just don't want someone to use these values without knowing what it means.
Also rename a couple of variables to be a little more descriptive.
feldschlachtiv
changed the title
|
@sanathkr - Thank you for your comment. I think your suggestion makes sense, so I made a couple of changes. Let me know your thoughts about it - especially the renaming looks in-line with what you meant? |
sanathkr
approved these changes
Aug 23, 2019
|
Appreciate the changes. Approved. |
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.
For compatibility with Windows. relpath() fails when the specified path is on a different drive.
Issue #, if available: #1336
Description of changes: use abspath() instead of relpath(), so cli command succeeds even when running on windows where sam and build_dir/template are located on different drive.
Checklist:
make prpassesBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.