From f0b14fb1d414e7158284565ba5632e3957d19f3b Mon Sep 17 00:00:00 2001
From: Mitchel Humpherys <mitchelh@codeaurora.org>
Date: Mon, 27 Jan 2014 10:49:57 -0800
Subject: [PATCH] linux-ramdump-parser-v2: respect --nm-path and --gdb-path
Somewhere along the way we started ignoring the --nm-path and --gdb-path
options. Fix this. Also ensure that the command line options take
precedence over anything from local_settings.py or anything discovered
from CROSS_COMPILE.
Change-Id: I39ff653c7de7fb1de170701b898567c9b2356835
---
linux-ramdump-parser-v2/ramparse.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/linux-ramdump-parser-v2/ramparse.py b/linux-ramdump-parser-v2/ramparse.py
index 87c7260..f382552 100755
--- a/linux-ramdump-parser-v2/ramparse.py
+++ b/linux-ramdump-parser-v2/ramparse.py
@@ -145,18 +145,18 @@ if __name__ == '__main__':
'Path {0} does not exist for Ram dumps. Exiting...'.format(options.autodump))
sys.exit(1)
- gdb_path = None
- nm_path = None
+ gdb_path = options.gdb
+ nm_path = options.nm
try:
import local_settings
- gdb_path = local_settings.gdb_path
- nm_path = local_settings.nm_path
+ gdb_path = gdb_path or local_settings.gdb_path
+ nm_path = nm_path or local_settings.nm_path
except ImportError:
cross_compile = os.environ.get('CROSS_COMPILE')
if cross_compile is not None:
- gdb_path = cross_compile+"gdb"
- nm_path = cross_compile+"nm"
+ gdb_path = gdb_path or cross_compile+"gdb"
+ nm_path = nm_path or cross_compile+"nm"
if gdb_path is None or nm_path is None:
print_out_str("!!! Incorrect path for toolchain specified.")
--
GitLab