libpius: expand user '~' in options #108
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
jaymzh
requested changes
Feb 8, 2019
| @@ -84,6 +91,8 @@ def parse_dotfile(parser): | |||
| parts = sep.split(line.strip()) | |||
| if not parts[0].startswith('--'): | |||
| parts[0] = '--%s' % parts[0] | |||
| if parts[0] in EXPAND_USER_OPTIONS and len(parts) > 1: | |||
| parts[1] = os.path.expanduser(parts[1]) | |||
| if parser.has_option(parts[0]): | |||
| opts.extend(parts) | |||
| elif not parts[0] in VALID_OPTIONS: | |||
There was a problem hiding this comment.
I know I wrote this code, but... I also, dunno what the point is.
If it's a valid option, then parser.has_option will be true, and if not, it's not a valid option... so we should get ride of VALID_OPTIONS altogether, and just make this an else, I think... you don't have to do that in this PR, just... happened to notice this.
| @@ -25,6 +25,7 @@ | |||
| '--interactive', | |||
| '--all-keys', | |||
| '--gpg-agent', | |||
| '--gpg-path', | |||
There was a problem hiding this comment.
this ... doesn't do anything afaict. See other comment.
| @@ -37,6 +38,12 @@ | |||
| '--policy-url', | |||
| '--verbose', | |||
| ] | |||
| EXPAND_USER_OPTIONS = [ | |||
|
Ping? |
Signed-off-by: Matej Dujava <[email protected]>
mdujava
force-pushed
the
expand_user_in_path
branch
from
94759ba to
70881cc
Compare
|
Hi, sorry I missed that one option, updated. abut that VALID_OPTIONS, yeah, it might be leftover before moving to argparse or something like that. |
jaymzh
approved these changes
Jun 28, 2019
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 an option takes the path, run expanduser so '~' will be expanded to correct directory.
Fixing #42.
Signed-off-by: Matej Dujava [email protected]