Make GoLangMatchFileFilter work on Windows#103
Merged
marcuslinke merged 1 commit intodocker-java:masterfrom Nov 26, 2014
Merged
Make GoLangMatchFileFilter work on Windows#103marcuslinke merged 1 commit intodocker-java:masterfrom
marcuslinke merged 1 commit intodocker-java:masterfrom
Conversation
Without this, BuildImageCmdImplTest.testDockerBuilderAddFolder() and BuildImageCmdImplTest.testDockerIgnore() both fail with java.util.regex.PatternSyntaxException: Illegal/unsupported escape sequence near index 3 D:\Eclipse\Jenkins\docker-java\target\test-classes\testDockerignore\a\ ^ at java.util.regex.Pattern.error(Pattern.java:1924) at java.util.regex.Pattern.escape(Pattern.java:2416) at java.util.regex.Pattern.atom(Pattern.java:2164) at java.util.regex.Pattern.sequence(Pattern.java:2097) at java.util.regex.Pattern.expr(Pattern.java:1964) at java.util.regex.Pattern.compile(Pattern.java:1665) at java.util.regex.Pattern.<init>(Pattern.java:1337) at java.util.regex.Pattern.compile(Pattern.java:1022) at java.lang.String.replaceFirst(String.java:2119) at com.github.dockerjava.core.GoLangMatchFileFilter.accept(GoLangMatchFileFilter.java:26) at org.apache.commons.io.filefilter.AndFileFilter.accept(AndFileFilter.java:122) at org.apache.commons.io.filefilter.OrFileFilter.accept(OrFileFilter.java:118) at java.io.File.listFiles(File.java:1285)
marcuslinke
added a commit
that referenced
this pull request
Nov 26, 2014
Make GoLangMatchFileFilter work on Windows
Contributor
|
@albers Thanks Harald! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
GoLangMatchFileFilteruses a regular expression to strip the base dir part from the absolute path.This fails on Windows because backslashes are not properly escaped (see commit message).
This PR replaces the substitution with a string operation.