From d03f32142ca0e05cc87855337557f8ea33972658 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@google.com>
Date: Tue, 19 Jan 2016 16:21:57 +0000
Subject: Replace %{product} in option help texts too.

Fixes #730.

--
MOS_MIGRATED_REVID=112475309
---
 .../devtools/build/lib/runtime/BlazeCommandUtils.java  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/runtime')

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
index 3f14471ac5..3ba6e22ef9 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
@@ -131,15 +131,19 @@ public class BlazeCommandUtils {
       throw new IllegalStateException("Help template for '" + topic + "' omits %{options}!");
     }
 
-    return template.
-        replace("%{product}", Constants.PRODUCT_NAME).
-        replace("%{command}", topic).
-        replace("%{options}", parser.describeOptions(categoryDescriptions, helpVerbosity)).
-        trim()
+    String optionStr =
+        parser
+            .describeOptions(categoryDescriptions, helpVerbosity)
+            .replace("%{product}", Constants.PRODUCT_NAME);
+    return template
+            .replace("%{product}", Constants.PRODUCT_NAME)
+            .replace("%{command}", topic)
+            .replace("%{options}", optionStr)
+            .trim()
         + "\n\n"
         + (helpVerbosity == OptionsParser.HelpVerbosity.MEDIUM
-           ? "(Use 'help --long' for full details or --short to just enumerate options.)\n"
-           : "");
+            ? "(Use 'help --long' for full details or --short to just enumerate options.)\n"
+            : "");
   }
 
   /**
-- 
cgit v1.2.3