sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[matter] catch KeyboardInterrupt separately when using os.fork()

Browse Source
This commit is contained in:
Fabio Erculiani
2011-08-07 11:52:50 +02:00
parent 8102b6efad
commit 4695682fb3
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/matter
View File

@@ -44,10 +44,14 @@ def exec_cmd(args, env = None):
"""
pid = os.fork()
if pid == 0:
if env is not None:
os.execvpe(args[0], args, env)
else:
os.execvp(args[0], args)
try:
if env is not None:
os.execvpe(args[0], args, env)
else:
os.execvp(args[0], args)
except Exception as exc:
entropy.tools.print_traceback()
os._exit(1)
else:
try:
rcpid, rc = os.waitpid(pid, os.P_WAIT)
@@ -565,6 +569,8 @@ class PackageBuilder(object):
try:
rc = self._run_builder(std_env, pkg_queue,
not_found_queue, not_installed_queue)
except KeyboardInterrupt:
os._exit(1)
except Exception as exc:
entropy.tools.print_traceback()
sys.stderr.write(repr(exc) + "\n")
@@ -580,6 +586,13 @@ class PackageBuilder(object):
else:
try:
rcpid, exit_st = os.waitpid(pid, os.P_WAIT)
except KeyboardInterrupt:
try:
os.kill(pid, signal.SIGTERM)
except OSError as err:
if err.errno != errno.ESRCH:
raise
exit_st = 1
except Exception as exc:
try:
os.kill(pid, signal.SIGTERM)
@@ -857,12 +870,17 @@ class PackageBuilder(object):
if vardb._plib_registry.hasEntries():
os._exit(1)
os._exit(0)
except KeyboardInterrupt:
os._exit(1)
except Exception as exc:
sys.stderr.write(repr(exc) + "\n")
os._exit(1)
else:
try:
rcpid, rc = os.waitpid(pid, os.P_WAIT)
except KeyboardInterrupt:
os.kill(pid, signal.SIGTERM)
rc = 1
except Exception as exc:
os.kill(pid, signal.SIGTERM)
rc = 1
@@ -1282,7 +1300,7 @@ Environment variables passed to --pkgpre/--pkgpost executables:
print_error("unable to acquire Entropy Resources lock")
raise SystemExit(42)
except KeyboardInterrupt:
print_error("Keyboard interruption")
print_error("Keyboard Interrupt, pid: %s" % (os.getpid(),))
raise SystemExit(100)
finally:
if entropy_server is not None: