scripts/version.py: Use regex grouping to extract the version #2298
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
lstrip
andrstrip
functions take a set of characters to remove, not aprefix/suffix. Thus
rstrip('-x86_64')
will remove any trailing characters inthe string
'-x86_64'
in any order (in effect it strips the suffix matchingthe regex
[-_x468]*
). So with18.09.4
it removes the4
suffix resultingin trying to
int('')
later on:Since we no longer need to check for the arch suffix (since it no longer
appears in the URLs we are traversing) we could just drop the
rstrip
andinvent a local prefix stripping helper to replace
lstrip('docker-')
. Insteadlets take advantage of the behaviour of
re.findall
which is that if the regexcontains a single
()
match that will be returned. This lets us match exactlythe sub-section of the regex we require.
While editing the regex, also ensure that the suffix is precisely
.tgz
andnot merely
tgz
by adding an explicit\.
, previously the literal.
wouldbe swallowed by the
.*
instead.Signed-off-by: Ian Campbell ijc@docker.com