From 1be02b1d87d84392f2d6ad613bb731b960663903 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 10 Nov 2015 13:21:11 -0500 Subject: [PATCH] rbd: corrected handling of '--image-feature' optional Signed-off-by: Jason Dillaman --- src/tools/rbd/ArgumentTypes.cc | 2 +- src/tools/rbd/ArgumentTypes.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/rbd/ArgumentTypes.cc b/src/tools/rbd/ArgumentTypes.cc index d8c2c1f55b0de..95b9a383bdd62 100644 --- a/src/tools/rbd/ArgumentTypes.cc +++ b/src/tools/rbd/ArgumentTypes.cc @@ -172,7 +172,7 @@ void add_create_image_options(po::options_description *opt, opt->add_options() (IMAGE_ORDER.c_str(), po::value(), "object order [12 <= order <= 25]") - (IMAGE_FEATURES.c_str(), po::value()->multitoken(), + (IMAGE_FEATURES.c_str(), po::value()->composing(), ("image features\n" + get_short_features_help(true)).c_str()) (IMAGE_SHARED.c_str(), po::bool_switch(), "shared image") (IMAGE_STRIPE_UNIT.c_str(), po::value(), "stripe unit") diff --git a/src/tools/rbd/ArgumentTypes.h b/src/tools/rbd/ArgumentTypes.h index 985279ae58e59..47ad55f107d8e 100644 --- a/src/tools/rbd/ArgumentTypes.h +++ b/src/tools/rbd/ArgumentTypes.h @@ -55,7 +55,7 @@ static const std::string WHOLE_OBJECT("whole-object"); static const std::string IMAGE_FORMAT("image-format"); static const std::string IMAGE_NEW_FORMAT("new-format"); static const std::string IMAGE_ORDER("order"); -static const std::string IMAGE_FEATURES("image-features"); +static const std::string IMAGE_FEATURES("image-feature"); static const std::string IMAGE_SHARED("image-shared"); static const std::string IMAGE_SIZE("size"); static const std::string IMAGE_STRIPE_UNIT("stripe-unit"); -- 2.39.5