summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-03-16 22:45:50 -0700
committerMerov Linden <merov@lindenlab.com>2011-03-16 22:45:50 -0700
commit92a68f350479cb4319c13e6784fb60e9d9b6d355 (patch)
tree00763732516134220c7c1a2c8bd1f5598d809f65 /build.sh
parent399d0aa76422362dbd9371d8f24d3863d3cabdfa (diff)
Autobuild: go back to ignoring errors on autobuild source_environment invocation for the moment
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh21
1 files changed, 12 insertions, 9 deletions
diff --git a/build.sh b/build.sh
index f0c5dc91fc..e302d95e76 100755
--- a/build.sh
+++ b/build.sh
@@ -142,16 +142,19 @@ then
fi
# load autbuild provided shell functions and variables
-if "$AUTOBUILD" source_environment > source_environment
-then
- . source_environment
-else
+# Merov: going back to the previous code that passes even if it fails catching a failure
+# TODO: use the correct code here under and fix the llbase import in python code
+#if "$AUTOBUILD" source_environment > source_environment
+#then
+# . source_environment
+#else
# dump environment variables for debugging
- env|sort
- record_failure "autobuild source_environment failed"
- cat source_environment >&3
- exit 1
-fi
+# env|sort
+# record_failure "autobuild source_environment failed"
+# cat source_environment >&3
+# exit 1
+#fi
+eval "$("$AUTOBUILD" source_environment)"
# dump environment variables for debugging
env|sort