[kupfer] wscript: If python is not found, try setting to python2.6
- From: Ulrik Sverdrup <usverdrup src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [kupfer] wscript: If python is not found, try setting to python2.6
- Date: Mon, 15 Feb 2010 00:39:10 +0000 (UTC)
commit f7082205cc77f45464d78a635403efb9638bdeb2
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date: Mon Feb 15 01:37:10 2010 +0100
wscript: If python is not found, try setting to python2.6
wscript | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/wscript b/wscript
index bfd2bf8..1c6da3d 100644
--- a/wscript
+++ b/wscript
@@ -106,7 +106,15 @@ def set_options(opt):
def configure(conf):
conf.check_tool("python")
- conf.check_python_version((2,6,0))
+ try:
+ conf.check_python_version((2,6,0))
+ except Configure.ConfigurationError:
+ # with explicitly set python that is not found, we
+ # must show an error
+ if os.getenv("PYTHON"):
+ raise
+ conf.env["PYTHON"] = "python2.6"
+ conf.check_python_version((2,6,0))
conf.check_tool("misc gnu_dirs")
# BUG: intltool requires gcc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]