summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2018-06-12 09:49:09 +0200
committerNiels de Vos <ndevos@redhat.com>2018-06-18 13:19:34 +0000
commit45edc547a827c4e38b7ec82de6d96e77ca5e593f (patch)
treeb333f1ba66f4f0b19a2db87f50a2a52a37e8cc99
parent67b2233055091fad6ad7d14c65e3bc12871bab82 (diff)
gcron: catch OSError as well as IOError
In case os.open() fails because the file does not exist, an OSError is raised. To prevent the script to abort uncleanly, catch the OSError in addition to the IOError. Change-Id: I48e5b23e17d63639cc33db51b4229249a9887880 Fixes: bz#1590195 Signed-off-by: Niels de Vos <ndevos@redhat.com> (cherry picked from commit 26b52694feb04c98e6c9436bcd4e23e1687f0237)
-rwxr-xr-xextras/snap_scheduler/gcron.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/extras/snap_scheduler/gcron.py b/extras/snap_scheduler/gcron.py
index 3f2ba38..8537132 100755
--- a/extras/snap_scheduler/gcron.py
+++ b/extras/snap_scheduler/gcron.py
@@ -105,10 +105,10 @@ def doJob(name, lockFile, jobFunc, volname):
else:
log.info("Job %s has been processed already", name)
fcntl.flock(f, fcntl.LOCK_UN)
- except IOError as (errno, strerror):
+ except (OSError, IOError) as (errno, strerror):
log.info("Job %s is being processed by another agent", name)
os.close(f)
- except IOError as (errno, strerror):
+ except (OSError, IOError) as (errno, strerror):
log.debug("Failed to open lock file %s : %s", lockFile, strerror)
log.error("Failed to process job %s", name)
success = False