[oe-commits] Richard Purdie : scripts/oe-git-proxy-socks-command: Improve error fallback /handling
git at git.openembedded.org
git at git.openembedded.org
Fri Mar 2 12:27:49 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 46c675d85603d7a573bc59638ce615aba9fd7df2
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=46c675d85603d7a573bc59638ce615aba9fd7df2
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Thu Mar 1 22:09:33 2012 +0000
scripts/oe-git-proxy-socks-command: Improve error fallback/handling
If oe-git-proxy-socks isn't available, try and create it.
If that fails, tell the user there is a problem, don't just fail
to find the command.
[YOCTO #2007]
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/oe-git-proxy-socks-command | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/scripts/oe-git-proxy-socks-command b/scripts/oe-git-proxy-socks-command
index 90fa14e..39e0acb 100755
--- a/scripts/oe-git-proxy-socks-command
+++ b/scripts/oe-git-proxy-socks-command
@@ -1,2 +1,17 @@
#! /bin/bash
+SCRIPTDIR=`dirname $0`
+# Check oe-git-proxy-socks exists
+PROXYSOCKS=`which oe-git-proxy-socks 2> /dev/null`
+if [ -z "$PROXYSOCKS" -a -e "$SCRIPTDIR/oe-git-proxy-socks.c" ]; then
+ # If not try and build it
+ gcc $SCRIPTDIR/oe-git-proxy-socks.c -o $SCRIPTDIR/oe-git-proxy-socks
+fi
+PROXYSOCKS=`which oe-git-proxy-socks 2> /dev/null`
+if [ ! -x "$PROXYSOCKS" ]; then
+ # If that fails, explain to the user
+ echo "Unable to find oe-git-proxy-socks. This is usually created with the command"
+ echo "'gcc scripts/oe-git-proxy-socks.c -o scripts/oe-git-proxy-socks' which we tried"
+ echo "but it doesn't seem to have worked. Please compile the binary manually."
+ exit 1
+fi
oe-git-proxy-socks -S $GIT_PROXY_HOST:$GIT_PROXY_PORT $@
More information about the Openembedded-commits
mailing list