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 014aad9800973a31071a29b9cbdc2aa70d8476e5..7e3380190e4c5ea4af8f2bf813be7cb43fb4f023 100644 (file)
--- a/BaseTools/Scripts/BinToPcd.py
+++ b/BaseTools/Scripts/BinToPcd.py
@@ -186,11 +186,8 @@ if __name__ == '__main__':
       print '    [PcdsDynamicVpd]'\r
       print '    [PcdsDynamicExVpd]'\r
   elif args.PcdType == 'HII':\r
       print '    [PcdsDynamicVpd]'\r
       print '    [PcdsDynamicExVpd]'\r
   elif args.PcdType == 'HII':\r

-    if args.VariableGuid is None:\r
-      print 'BinToPcd: error: argument --variable-guid is required for --type HII.'\r
-      sys.exit()\r
-    if args.VariableName is None:\r
-      print 'BinToPcd: error: argument --variable-name is required for --type HII.'\r
+    if args.VariableGuid is None or args.VariableName is None:\r
+      print 'BinToPcd: error: arguments --variable-guid and --variable-name are required for --type HII.'\r

       sys.exit()\r
     if args.Offset is None:\r
       #\r
       sys.exit()\r
     if args.Offset is None:\r
       #\r