tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools ConvertMasmToNasm: Fix running script outside of a git tree 

The script previously would hit an exception if it was run outside of
a git tree.

The exception looked like:

edk2/BaseTools/Scripts/ConvertMasmToNasm.py Version 0.01
Traceback (most recent call last):
  File "edk2/BaseTools/Scripts/ConvertMasmToNasm.py", line 986, in <module>
    ConvertAsmApp()
  File "edk2/BaseTools/Scripts/ConvertMasmToNasm.py", line 984, in __init__
    ConvertAsmFile(src, dst, self)
  File "edk2/BaseTools/Scripts/ConvertMasmToNasm.py", line 209, in __init__
    CommonUtils.__init__(self, clone)
  File "edk2/BaseTools/Scripts/ConvertMasmToNasm.py", line 69, in __init__
    self.gitemail = clone.gitemail
AttributeError: ConvertAsmApp instance has no attribute 'gitemail'

Fixes: https://github.com/tianocore/edk2/issues/63
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Jordan Justen 2016-02-10 10:08:37 -08:00
parent eca22f362c
commit 5369c2bb73
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BaseTools/Scripts/ConvertMasmToNasm.py
View File

@ -1,7 +1,7 @@
# @file ConvertMasmToNasm.py # @file ConvertMasmToNasm.py
# This script assists with conversion of MASM assembly syntax to NASM # This script assists with conversion of MASM assembly syntax to NASM
# #
# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
# #
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -127,6 +127,7 @@ class CommonUtils:
while True: while True:
path = os.path.split(lastpath)[0] path = os.path.split(lastpath)[0]
if path == lastpath: if path == lastpath:
self.gitemail = None
return return
candidate = os.path.join(path, '.git') candidate = os.path.join(path, '.git')
if os.path.isdir(candidate): if os.path.isdir(candidate):
@ -197,6 +198,7 @@ class CommonUtils:
message += '%s to %s\n' % (src, dst) message += '%s to %s\n' % (src, dst)
message += '\n' message += '\n'
message += 'Contributed-under: TianoCore Contribution Agreement 1.0\n' message += 'Contributed-under: TianoCore Contribution Agreement 1.0\n'
assert(self.gitemail is not None)
message += 'Signed-off-by: %s\n' % self.gitemail message += 'Signed-off-by: %s\n' % self.gitemail
cmd = ('git', 'commit', '-F', '-') cmd = ('git', 'commit', '-F', '-')