Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for false sandbox violation alarms by Eren Turkay.

Browse Source 
BUG:FIXED:2791
This commit is contained in:
Faik Uygur
2008-09-03 18:03:57 +00:00
parent 15aeb36895
commit 29f070c335
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/operations/build.py
+11 -1
View File
@@ -13,6 +13,7 @@
# python standard library # python standard library
import os import os
import sys
import glob import glob
import copy import copy
import stat import stat
@@ -461,8 +462,17 @@ class Builder:
valid_paths.append("%s/.ccache" % os.environ["HOME"]) valid_paths.append("%s/.ccache" % os.environ["HOME"])
ret = catbox.run(self.actionLocals[func], valid_paths, logger=self.log_sandbox_violation) ret = catbox.run(self.actionLocals[func], valid_paths, logger=self.log_sandbox_violation)
if ret.code == 1 or ret.violations != []: # Retcode can be 0 while there is a sanbox violation, so only look for violations to correctly handle it
if ret.violations != []:
ctx.ui.error(_("Sandbox violation result:"))
for result in ret.violations:
ctx.ui.error("* %s (%s -> %s)" % (result[0], result[1], result[2]))
raise Error(_("Sandbox violations!")) raise Error(_("Sandbox violations!"))
else:
# Retcode is 1 when there is a python exception.
# This is for actionsapi's exceptions. Without this, when exception is raised, build process continues.
if ret.code == 1:
sys.exit(1)
else: else:
if mandatory: if mandatory:
raise Error(_("unable to call function from actions: %s") % func) raise Error(_("unable to call function from actions: %s") % func)