summaryrefslogtreecommitdiff
path: root/menuconfig.py
diff options
context:
space:
mode:
authorUlf Magnusson <ulfalizer@gmail.com>2019-07-01 22:52:17 +0200
committerUlf Magnusson <ulfalizer@gmail.com>2019-07-02 00:03:02 +0200
commite5e2fe5a6f084fb98c2c9b4adec0383fec4a5256 (patch)
treec0670e6a3d7ced09a403e0ae0b0c60c2ffc21375 /menuconfig.py
parent5be5bfbc401a4e3021198145e8b7c9a70f0fae5c (diff)
Catch EnvironmentError instead of OSError/IOError
menuconfig.py tended to crash on I/O errors on Python 2, due to forgetting to update some 'except OSError's. Catch EnvironmentError instead. EnvironmentError is a common base class of IOError and OSError on Python 2, and an alias for OSError on Python 3. Use it elsewhere too, as it might help catch obscure I/O errors on Python 2.
Diffstat (limited to 'menuconfig.py')
-rwxr-xr-xmenuconfig.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/menuconfig.py b/menuconfig.py
index 6afc1c4..799cc4a 100755
--- a/menuconfig.py
+++ b/menuconfig.py
@@ -1829,7 +1829,7 @@ def _try_load(filename):
try:
_kconf.load_config(filename)
return True
- except OSError as e:
+ except EnvironmentError as e:
_error("Error loading '{}'\n\n{} (errno: {})"
.format(filename, e.strerror, errno.errorcode[e.errno]))
return False
@@ -1881,7 +1881,7 @@ def _try_save(save_fn, filename, description):
try:
# save_fn() returns a message to print
return save_fn(filename)
- except OSError as e:
+ except EnvironmentError as e:
_error("Error saving {} to '{}'\n\n{} (errno: {})"
.format(description, e.filename, e.strerror,
errno.errorcode[e.errno]))