From: Kinney, Michael D <michael.d.kinney@intel.com>
Date: Sat, 9 Jun 2018 03:49:43 +0000 (-0700)
Subject: BaseTools/BinToPcd: Clarify error message for --type HII
X-Git-Tag: edk2-stable201903~1588
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=b2e043b6895d70c57ef390d160e05c9d6f44298d

BaseTools/BinToPcd: Clarify error message for --type HII

https://bugzilla.tianocore.org/show_bug.cgi?id=963

Update error message for --type HII.  If either --variable-guid
or --variable-name is missing, then print an error message that
states that both --variable-guid and --variable-name are required.

Cc: Yanyan Sun <yanyan.sun@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
---

diff --git a/BaseTools/Scripts/BinToPcd.py b/BaseTools/Scripts/BinToPcd.py
index 014aad9800..7e3380190e 100644
--- a/BaseTools/Scripts/BinToPcd.py
+++ b/BaseTools/Scripts/BinToPcd.py
@@ -186,11 +186,8 @@ if __name__ == '__main__':
       print '    [PcdsDynamicVpd]'
       print '    [PcdsDynamicExVpd]'
   elif args.PcdType == 'HII':
-    if args.VariableGuid is None:
-      print 'BinToPcd: error: argument --variable-guid is required for --type HII.'
-      sys.exit()
-    if args.VariableName is None:
-      print 'BinToPcd: error: argument --variable-name is required for --type HII.'
+    if args.VariableGuid is None or args.VariableName is None:
+      print 'BinToPcd: error: arguments --variable-guid and --variable-name are required for --type HII.'
       sys.exit()
     if args.Offset is None:
       #