Skip to content

Commit 5bf5bbf

Browse files
author
Vladimir Kotal
committed
fix exception handling
1 parent 933e716 commit 5bf5bbf

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

opengrok-tools/src/main/python/opengrok_tools/sync.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def main():
134134

135135
try:
136136
os.chdir("/")
137-
except OSError as e:
137+
except OSError:
138138
logger.error("cannot change working directory to /",
139139
exc_info=True)
140140
sys.exit(1)

opengrok-tools/src/main/python/opengrok_tools/utils/command.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,15 +191,15 @@ def close(self):
191191
if self.work_dir:
192192
try:
193193
orig_work_dir = os.getcwd()
194-
except OSError as e:
194+
except OSError:
195195
self.state = Command.ERRORED
196196
self.logger.error("Cannot get working directory",
197197
exc_info=True)
198198
return
199199

200200
try:
201201
os.chdir(self.work_dir)
202-
except OSError as e:
202+
except OSError:
203203
self.state = Command.ERRORED
204204
self.logger.error("Cannot change working directory to {}".
205205
format(self.work_dir), exc_info=True)
@@ -259,14 +259,14 @@ def close(self):
259259
if e:
260260
raise e
261261

262-
except KeyboardInterrupt as e:
262+
except KeyboardInterrupt:
263263
self.logger.info("Got KeyboardException while processing ",
264264
exc_info=True)
265265
self.state = Command.INTERRUPTED
266-
except OSError as e:
266+
except OSError:
267267
self.logger.error("Got OS error", exc_info=True)
268268
self.state = Command.ERRORED
269-
except TimeoutException as e:
269+
except TimeoutException:
270270
self.logger.error("Timed out")
271271
self.state = Command.TIMEDOUT
272272
else:
@@ -299,10 +299,10 @@ def close(self):
299299
if orig_work_dir:
300300
try:
301301
os.chdir(orig_work_dir)
302-
except OSError as e:
302+
except OSError:
303303
self.state = Command.ERRORED
304304
self.logger.error("Cannot change working directory back to {}".
305-
format(orig_work_dir))
305+
format(orig_work_dir), exc_info=True)
306306
return
307307

308308
def fill_arg(self, args_append=None, args_subst=None):

0 commit comments

Comments
 (0)