diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-09 23:45:52 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-06-09 23:45:52 -0700 |
| commit | e5dc2f9c8ff5dfe3266a0c144a1e21b96fa62e25 (patch) | |
| tree | 6c4beaa4cb505a86dc8084f1e533e903bb4c7c1e | |
| parent | c0be6aecc6c817e556e6bfd1251842615023644e (diff) | |
| download | vcpkg-e5dc2f9c8ff5dfe3266a0c144a1e21b96fa62e25.tar.gz vcpkg-e5dc2f9c8ff5dfe3266a0c144a1e21b96fa62e25.zip | |
[vcpkg] Rename --full-desc to --x-full-desc
| -rw-r--r-- | toolsrc/src/commands_list.cpp | 10 | ||||
| -rw-r--r-- | toolsrc/src/commands_search.cpp | 20 |
2 files changed, 13 insertions, 17 deletions
diff --git a/toolsrc/src/commands_list.cpp b/toolsrc/src/commands_list.cpp index 521fc5a9a..d21883fc2 100644 --- a/toolsrc/src/commands_list.cpp +++ b/toolsrc/src/commands_list.cpp @@ -7,16 +7,13 @@ namespace vcpkg::Commands::List { - static const std::string OPTION_FULLDESC = "--full-desc"; // TODO: This should find a better home, eventually + static const std::string OPTION_FULLDESC = "--x-full-desc"; // TODO: This should find a better home, eventually static void do_print(const StatusParagraph& pgh, bool FullDesc) { if (FullDesc) { - System::println("%-27s %-16s %s", - pgh.package.displayname(), - pgh.package.version, - pgh.package.description); + System::println("%-27s %-16s %s", pgh.package.displayname(), pgh.package.version, pgh.package.description); } else { @@ -33,7 +30,8 @@ namespace vcpkg::Commands::List "The argument should be a substring to search for, or no argument to display all installed libraries.\n%s", Commands::Help::create_example_string("list png")); args.check_max_arg_count(1, example); - const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({OPTION_FULLDESC}); + const std::unordered_set<std::string> options = + args.check_and_get_optional_command_arguments({OPTION_FULLDESC}); const StatusParagraphs status_paragraphs = database_load_check(paths); std::vector<StatusParagraph*> installed_packages = get_installed_ports(status_paragraphs); diff --git a/toolsrc/src/commands_search.cpp b/toolsrc/src/commands_search.cpp index 6ec2a5395..bdb1e5d77 100644 --- a/toolsrc/src/commands_search.cpp +++ b/toolsrc/src/commands_search.cpp @@ -8,9 +8,8 @@ namespace vcpkg::Commands::Search { - static const std::string OPTION_GRAPH = "--graph"; // TODO: This should find a better home, eventually - static const std::string OPTION_FULLDESC = "--full-desc"; // TODO: This should find a better home, eventually - + static const std::string OPTION_GRAPH = "--graph"; // TODO: This should find a better home, eventually + static const std::string OPTION_FULLDESC = "--x-full-desc"; // TODO: This should find a better home, eventually static std::string replace_dashes_with_underscore(const std::string& input) { @@ -51,17 +50,15 @@ namespace vcpkg::Commands::Search { if (FullDesc) { - System::println("%-20s %-16s %s", - source_paragraph.name, - source_paragraph.version, - source_paragraph.description); + System::println( + "%-20s %-16s %s", source_paragraph.name, source_paragraph.version, source_paragraph.description); } else { System::println("%-20s %-16s %s", - source_paragraph.name, - source_paragraph.version, - details::shorten_description(source_paragraph.description)); + source_paragraph.name, + source_paragraph.version, + details::shorten_description(source_paragraph.description)); } } @@ -71,7 +68,8 @@ namespace vcpkg::Commands::Search "The argument should be a substring to search for, or no argument to display all libraries.\n%s", Commands::Help::create_example_string("search png")); args.check_max_arg_count(1, example); - const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({OPTION_GRAPH, OPTION_FULLDESC}); + const std::unordered_set<std::string> options = + args.check_and_get_optional_command_arguments({OPTION_GRAPH, OPTION_FULLDESC}); const std::vector<SourceParagraph> source_paragraphs = Paragraphs::load_all_ports(paths.get_filesystem(), paths.ports); |
