From fe63df22971779c2cae4e13cc69689df1ae042c8 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Tue, 20 May 2008 07:34:34 +0000 Subject: [PATCH] Make sandbox parameters consistent with pisi-1.1 It had seen to be borked in 2008 hence enableSandbox in pisi.conf is False by default. --- pisi/cli/build.py | 4 ++-- pisi/configfile.py | 2 ++ pisi/operations/build.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pisi/cli/build.py b/pisi/cli/build.py index 15f356ea..ca43e32e 100644 --- a/pisi/cli/build.py +++ b/pisi/cli/build.py @@ -72,8 +72,8 @@ to be downloaded from a repository containing sources. help=_("PiSi binary package formats: '1.0', '1.1' (default)")) group.add_option("--use-quilt", action="store_true", default=False, help=_("Use quilt patch management system instead of GNU patch")) - group.add_option("--enable-sandbox", action="store_true", default=False, - help=_("Constrain build process inside the build folder")) + group.add_option("--ignore-sandbox", action="store_true", default=False, + help=_("Do not constrain build process inside the build folder")) def add_steps_options(self): group = optparse.OptionGroup(self.parser, _("build steps")) diff --git a/pisi/configfile.py b/pisi/configfile.py index 62d807fe..8b16b9ed 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -24,6 +24,7 @@ #[build] #host = i686-pc-linux-gnu #generateDebug = False +#enableSandbox = False #jobs = "-j1" #CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2 #CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2 @@ -78,6 +79,7 @@ class BuildDefaults: host = "i686-pc-linux-gnu" jobs = "-j1" generateDebug = False + enableSandbox = False cflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2" cxxflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2" ldflags = "-Wl,-O1 -Wl,-z,relro -Wl,--hash-style=gnu" diff --git a/pisi/operations/build.py b/pisi/operations/build.py index 5980829c..f67279df 100644 --- a/pisi/operations/build.py +++ b/pisi/operations/build.py @@ -438,7 +438,7 @@ class Builder: os.chdir(self.srcDir) if func in self.actionLocals: - if not ctx.get_option('enable_sandbox'): + if ctx.get_option('ignore_sandbox') or not ctx.config.values.build.enablesandbox: self.actionLocals[func]() else: import catbox