diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-09-06 17:49:33 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-09-06 17:49:33 -0700 |
| commit | 93ab504488eed81e62dd0080b993c5b7dcb49f4a (patch) | |
| tree | 92469361cde233e3be4257e8ee14638a8887a11a /toolsrc/src | |
| parent | 5e73df3a02d82d948635ac4caa54657c0c193f2e (diff) | |
| download | vcpkg-93ab504488eed81e62dd0080b993c5b7dcb49f4a.tar.gz vcpkg-93ab504488eed81e62dd0080b993c5b7dcb49f4a.zip | |
Revert "[vcpkg] allow underscores in package name"
This reverts commit aef3577672b469ed915a7b0680d5e1ccf36347ed.
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/PackageSpec.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/PackageSpecParseResult.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index 2baf3181b..890de8899 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -10,7 +10,7 @@ namespace vcpkg { static bool is_valid_package_spec_char(char c) { - return (c == '-') || (c == '_') || isdigit(c) || (isalpha(c) && islower(c)) || (c == '[') || (c == ']'); + return (c == '-') || isdigit(c) || (isalpha(c) && islower(c)) || (c == '[') || (c == ']'); } std::string FeatureSpec::to_string() const diff --git a/toolsrc/src/PackageSpecParseResult.cpp b/toolsrc/src/PackageSpecParseResult.cpp index 34398cff9..838c788ba 100644 --- a/toolsrc/src/PackageSpecParseResult.cpp +++ b/toolsrc/src/PackageSpecParseResult.cpp @@ -12,8 +12,8 @@ namespace vcpkg case PackageSpecParseResult::SUCCESS: return "OK"; case PackageSpecParseResult::TOO_MANY_COLONS: return "Too many colons"; case PackageSpecParseResult::INVALID_CHARACTERS: - return "Contains invalid characters. Only alphanumeric lowercase ASCII characters, dashes and" - "underscores are allowed"; + return "Contains invalid characters. Only alphanumeric lowercase ASCII characters and dashes are " + "allowed"; default: Checks::unreachable(VCPKG_LINE_INFO); } } |