Be more strict about versionlock strings #38
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
lamawithonel
force-pushed
the
versionlock_type
branch
from
80566b2
to
967c274
Compare
cmentzer
approved these changes
Feb 1, 2017
bastelfreak
reviewed
Feb 1, 2017
| @@ -0,0 +1 @@ | |||
| type Yum::VersionlockString = Pattern[/^([0-9\*]+):([0-9a-zA-Z\._\+%\{\}\*-]+)-([^-]+)-([0-9\*]+)\.(([0-9a-zZ-Z_\*]+)(?:\.(noarch|x86_64|i386|arm|ppc64|ppc64le|sparc64|ia64|alpha|ip|m68k|mips|mipsel|mk68k|mint|ppc|rs6000|s390|s390x|sh|sparc|xtensa|\*))?)$/] | |||
There was a problem hiding this comment.
is it possible to add a few strings where is is supposed to match/not match? So a non-yum person has a clue whats going on.
There was a problem hiding this comment.
Lots of documentation updates, including examples. Boom. Done.
heliocentric
reviewed
Feb 1, 2017
| @@ -0,0 +1 @@ | |||
| type Yum::VersionlockString = Pattern[/^([0-9\*]+):([0-9a-zA-Z\._\+%\{\}\*-]+)-([^-]+)-([0-9\*]+)\.(([0-9a-zZ-Z_\*]+)(?:\.(noarch|x86_64|i386|arm|ppc64|ppc64le|sparc64|ia64|alpha|ip|m68k|mips|mipsel|mk68k|mint|ppc|rs6000|s390|s390x|sh|sparc|xtensa|\*))?)$/] | |||
There was a problem hiding this comment.
It would be nice if types were composable, so you could do Pattern[^#{Yum::Version}:#{Yum::Epoch}] and this was readable and maintainable. But it's unfortunately they're not.
Maybe a documentation blurb breaking the regex out into it's components?
lamawithonel
force-pushed
the
versionlock_type
branch
from
967c274
to
eb3924a
Compare
This commit locks down the versionlock defined type using a more comprehensive regular expression, storing the Pattern in a type alias. Previously two simple regular expressions were used, but they allowed for invalid inputs with wildcards that spanned multiple fields-- wildcards are only permitted within an individual field.
lamawithonel
force-pushed
the
versionlock_type
branch
from
eb3924a
to
68fed88
Compare
|
thanks! |
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.
This commit locks down the versionlock defined type using a more
comprehensive regular expression, storing the Pattern in a type alias.
Previously two simple regular expressions were used, but they allowed
for invalid inputs with wildcards that spanned multiple fields--
wildcards are only permitted within an individual field.
Fixes #35