diff --git a/pisi/catbox.patch b/pisi/catbox.patch index 1b3911ee..17f26bc3 100644 --- a/pisi/catbox.patch +++ b/pisi/catbox.patch @@ -10,7 +10,7 @@ Index: build.py + import catbox + ret = catbox.run( + self.sandboxed, -+ ["/var/tmp/pisi", "/tmp", "/dev/tty", "/dev/null"], ++ ["/var/pisi", "/tmp", "/dev/tty", "/dev/null"], + logger = self.sandbox_logger + ) + if ret != 0: diff --git a/pisi/configfile.py b/pisi/configfile.py index cae6eb56..9418192d 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -85,7 +85,7 @@ class DirectoriesDefaults: archives_dir = "/var/cache/pisi/archives" packages_dir = "/var/cache/pisi/packages" index_dir = "/var/lib/pisi/index" - tmp_dir = "/var/tmp/pisi" + tmp_dir = "/var/pisi" kde_dir = "/usr/kde/3.5" qt_dir = "/usr/qt/3" diff --git a/pisi/util.py b/pisi/util.py index 7a0d0ca7..7791b09d 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -521,9 +521,8 @@ def strip_directory(top, excludelist=[]): extension = os.path.splitext(frpath)[1] if extension == ".la": # FIXME: I'm regular expr. idiot, so one can convert this to python... - os.system("sed -i -e 's~-L/var/tmp/pisi/[[:graph:]]*~~g' %s" % frpath) - os.system("sed -i -e 's~/var/tmp/pisi/[[:graph:]]*/install/~/~g' %s" % frpath) - + os.system("sed -i -e 's~-L%s/[[:graph:]]*~~g' %s" % (ctx.config.tmp_dir(), frpath)) + os.system("sed -i -e 's~%s/[[:graph:]]*/install/~/~g' %s" % (ctx.config.tmp_dir(), frpath)) # real path in .pisi package p = '/' + removepathprefix(top, frpath) strip = True