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

just testing

Browse Source
This commit is contained in:
S.Çağlar Onur
2008-05-09 15:36:04 +00:00
parent 683df02437
commit 7f260c80a8
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/operations/build.py
+6 -5
View File
@@ -444,7 +444,10 @@ class Builder:
import catbox import catbox
# stupid autoconf family needs /usr/lib/conftest* and /usr/lib/cf* for some conftest, # stupid autoconf family needs /usr/lib/conftest* and /usr/lib/cf* for some conftest,
# http://sources.gentoo.org/viewcvs.py/portage/trunk/sandbox/files/sandbox/sandbox.c also permits these # http://sources.gentoo.org/viewcvs.py/portage/trunk/sandbox/files/sandbox/sandbox.c also permits these
valid_dirs = [self.pkg_dir(), "/tmp/", "/var/tmp/", "/dev/tty", "/dev/pts/", "/dev/pty", "/dev/null", "/dev/zero", "/dev/ptmx", "/proc/", "/usr/lib/conftest", "/usr/lib/cf"] valid_dirs = [self.pkg_dir(), "/tmp/", "/var/tmp/", "/var/run/utmp", \
"/dev/tty", "/dev/pts/", "/dev/pty", \
"/dev/null", "/dev/zero", "/dev/ptmx", \
"/proc/", "/usr/lib/conftest", "/usr/lib/cf"]
if ctx.config.values.build.buildhelper == "ccache": if ctx.config.values.build.buildhelper == "ccache":
valid_dirs.append("%s/.ccache" % os.environ["HOME"]) valid_dirs.append("%s/.ccache" % os.environ["HOME"])
# every qt/KDE application check these # every qt/KDE application check these
@@ -456,10 +459,8 @@ class Builder:
valid_dirs.append("/usr/qt/3/etc/settings/qt_plugins_3.3rc.tmp") valid_dirs.append("/usr/qt/3/etc/settings/qt_plugins_3.3rc.tmp")
valid_dirs.append("/usr/qt/3/etc/settings/qt_plugins_3.3rc") valid_dirs.append("/usr/qt/3/etc/settings/qt_plugins_3.3rc")
ret = catbox.run(self.actionLocals[func], valid_dirs, logger=self.log_sandbox_violation) ret = catbox.run(self.actionLocals[func], valid_dirs, logger=self.log_sandbox_violation)
if ret.code == 1: if ret.code == 1 or ret.violations != []:
raise RuntimeError raise Error(_("Sandbox violaions!"))
if ret.violations != []:
ctx.ui.error(_("Sandbox violations!"))
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)