diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-04-18 15:50:06 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-12-09 12:50:48 +0100 |
commit | f9fc573a6ee7ccd9a436fbe55fdbf7d4e83a6248 (patch) | |
tree | 9f7eaf7aae8bf09a4212e32a8432518df01e2df4 | |
parent | 16daec09be3379f9e3768bddca23cf86f8a1a897 (diff) |
Add better error handling to debug windows python script
Change-Id: Ibc5171cf94ef819cf7926b899b83cc9de3037d07
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | tools/debug_windows.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/tools/debug_windows.py b/tools/debug_windows.py index ab1c03aba..02e00a504 100644 --- a/tools/debug_windows.py +++ b/tools/debug_windows.py @@ -154,17 +154,22 @@ def get_installed_windows_kits(): roots_key = r"SOFTWARE\Microsoft\Windows Kits\Installed Roots" log.info("Searching for Windows kits in registry path: " "{}".format(roots_key)) - roots = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, roots_key, 0, - winreg.KEY_READ) + kits = [] pattern = re.compile(r'KitsRoot(\d+)') - - for (name, value, value_type) in sub_values(roots): - if value_type == winreg.REG_SZ and name.startswith('KitsRoot'): - match = pattern.search(name) - if match: - version = match.group(1) - kits.append({'version': version, 'value': value}) + try: + roots = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, roots_key, 0, + winreg.KEY_READ) + + for (name, value, value_type) in sub_values(roots): + if value_type == winreg.REG_SZ and name.startswith('KitsRoot'): + match = pattern.search(name) + if match: + version = match.group(1) + kits.append({'version': version, 'value': value}) + + except WindowsError as e: + log.exception(e) if not kits: log.error(dedent(""" |