diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java | 14 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/vfs/WindowsPathFragment.java | 7 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java index 0800367703..492cef9a1d 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java @@ -154,20 +154,6 @@ public class CommonCommandOptions extends OptionsBase { ) public List<Map.Entry<String, String>> clientEnv; - @Deprecated - @Option( - name = "ignore_client_env", - defaultValue = "false", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - metadataTags = {OptionMetadataTag.HIDDEN, OptionMetadataTag.DEPRECATED}, - effectTags = {OptionEffectTag.NO_OP}, - deprecationWarning = "Deprecated, no-op.", - help = "Deprecated, no-op." - ) - // TODO(laszlocsomor, dslomov) 2017-03-07: remove this flag after 2017-06-01 (~3 months from now) - // and all of its occurrences. - public boolean ignoreClientEnv; - @Option( name = "client_cwd", defaultValue = "", diff --git a/src/main/java/com/google/devtools/build/lib/vfs/WindowsPathFragment.java b/src/main/java/com/google/devtools/build/lib/vfs/WindowsPathFragment.java index 4f94535acf..695282f003 100644 --- a/src/main/java/com/google/devtools/build/lib/vfs/WindowsPathFragment.java +++ b/src/main/java/com/google/devtools/build/lib/vfs/WindowsPathFragment.java @@ -56,11 +56,14 @@ abstract class WindowsPathFragment extends PathFragment { // primary separator char and do not use this. private static final char EXTRA_SEPARATOR_CHAR = '\\'; + private static boolean isDriveLetter(char c) { + return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); + } + @Override PathFragment create(String path) { - // TODO(laszlocsomor): Character#isLetter returns true for some non ASCII characters. char driveLetter = - path.length() >= 2 && path.charAt(1) == ':' && Character.isLetter(path.charAt(0)) + path.length() >= 2 && path.charAt(1) == ':' && isDriveLetter(path.charAt(0)) ? Character.toUpperCase(path.charAt(0)) : '\0'; if (driveLetter != '\0') { |