1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00

Merge pull request #2165 from AlanCoding/bwrap_where_art_thou

log details for unhandled bwrap case
This commit is contained in:
Alan Rominger 2018-06-14 15:18:09 -04:00 committed by GitHub
commit ad354238e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -783,7 +783,9 @@ def check_proot_installed():
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
proc.communicate() proc.communicate()
return bool(proc.returncode == 0) return bool(proc.returncode == 0)
except (OSError, ValueError): except (OSError, ValueError) as e:
if isinstance(e, ValueError) or getattr(e, 'errno', 1) != 2: # ENOENT, no such file or directory
logger.exception('bwrap unavailable for unexpected reason.')
return False return False