From: Kinney, Michael D <michael.d.kinney@intel.com>
Date: Sun, 29 Jul 2018 17:01:37 +0000 (-0700)
Subject: BaseTools/Capsule: Prevent traceback during signing operations
X-Git-Tag: edk2-stable201903~1294
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=e49eee4c51a6cb8b2f35735e375c211c41d9f6cb;ds=sidebyside

BaseTools/Capsule: Prevent traceback during signing operations

https://bugzilla.tianocore.org/show_bug.cgi?id=1046
https://bugzilla.tianocore.org/show_bug.cgi?id=1048
https://bugzilla.tianocore.org/show_bug.cgi?id=1050

Remove raise statements that generate Tracebacks that were only
intended for development/debug.  With the raise statements removed
proper error messages are shown.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
---

diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools/Source/Python/Capsule/GenerateCapsule.py
index d829000849..42cd1fb8ba 100644
--- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py
+++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py
@@ -408,7 +408,6 @@ if __name__ == '__main__':
                                  )
             except:
                 print ('GenerateCapsule: error: can not sign payload')
-                raise
                 sys.exit (1)
 
             try:
@@ -496,7 +495,6 @@ if __name__ == '__main__':
                 print ('========')
         except:
             print ('GenerateCapsule: error: can not decode capsule')
-            raise
             sys.exit (1)
 
     elif args.DumpInfo: