From f4805ca6cf67d1d8394b14f21eceb2d9592ba228 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Sun, 15 Oct 2017 18:41:10 +0530 Subject: snapshot/scheduler: handle the exception when SELinux is absent When SELinux is absent on an given system, snapshot_scheduler.py raises an exception; handle it and report it in the log. Change-Id: I21bc179e090d34f8061063e6d662521ee5046cce BUG: 1502253 Signed-off-by: Rishabh Dave --- extras/snap_scheduler/snap_scheduler.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/extras/snap_scheduler/snap_scheduler.py b/extras/snap_scheduler/snap_scheduler.py index 61d1c514a9a..c6600a4a3d7 100755 --- a/extras/snap_scheduler/snap_scheduler.py +++ b/extras/snap_scheduler/snap_scheduler.py @@ -575,8 +575,13 @@ def get_selinux_status(): getenforce_cli = ["getenforce"] log.debug("Running command '%s'", " ".join(getenforce_cli)) - p1 = subprocess.Popen(getenforce_cli, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + try: + p1 = subprocess.Popen(getenforce_cli, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + except OSError as oserr: + log.error("Failed to run the command \"getenforce\". Error: %s" %\ + oserr) + return -1 output, err = p1.communicate() rv = p1.returncode -- cgit