diff options
| author | Sascha Silbe <silbe@sugarlabs.org> | 2011-08-27 09:00:21 (GMT) |
|---|---|---|
| committer | Sascha Silbe <silbe@sugarlabs.org> | 2011-08-27 09:04:08 (GMT) |
| commit | 666be9af7f229c206612467d9126bf2ed3070ad5 (patch) | |
| tree | 8ad6335e059e44248def72a6cb87a317c2e20ec5 | |
| parent | 5923202d300b0441cfb39a55a78a6513b0126771 (diff) | |
adapt to upstream change (commit cf378fe55e86f2bd3df50283d6b993c6c5721f57)
jhbuild.config.Config.prefix is now used in load(), too. Since it gets set in
the same function, we don't have a chance to examine and modify it (other than
copying over the entire function which would be rather fragile) like we did
before in setup_env(). Instead we set it in sugar.jhbuildrc like an individual
user would do.
Signed-off-by: Sascha Silbe <silbe@sugarlabs.org>
| -rw-r--r-- | sjhbuild/config.py | 4 | ||||
| -rw-r--r-- | sugar.jhbuildrc | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sjhbuild/config.py b/sjhbuild/config.py index 1b557c9..95105ad 100644 --- a/sjhbuild/config.py +++ b/sjhbuild/config.py @@ -33,10 +33,6 @@ class Config(jhbuild.config.Config): self.skip.append(source) def setup_env(self): - # Hack to replace the default prefix - if self.prefix == '/opt/gnome': - self.prefix = os.path.join(self.base_dir, 'install') - #Hack to allow sugar-jhbuild to find its self again. MY_PATH = os.getenv('PATH', 'Error') diff --git a/sugar.jhbuildrc b/sugar.jhbuildrc index ef8181d..dd68aff 100644 --- a/sugar.jhbuildrc +++ b/sugar.jhbuildrc @@ -1,4 +1,5 @@ use_local_modulesets = True +prefix = os.path.join(os.path.dirname(__file__), 'install') modulesets_dir = os.path.join(os.path.dirname(__file__), 'config/modulesets') jhbuildbot_slaves_dir = os.path.join(os.path.dirname(__file__), 'sbuildbot') jhbuildbot_mastercfg = os.path.join(os.path.dirname(__file__), 'sbuildbot', 'master.cfg') |