← Back to branch summary

~ubuntu-branches/ubuntu/natty/eucalyptus/natty-updates

« back to all changes in this revision

Viewing changes to tools/euca_conf.in

  • Committer: Bazaar Package Importer
  • Author(s): Dustin Kirkland
  • Date: 2009-12-17 18:22:02 UTC
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: james.westby@ubuntu.com-20091217182202-0v2v09ry3cxrvh84
Tags: upstream-1.6.2~bzr1103
Import upstream version 1.6.2~bzr1103

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/euca_conf.in
205
205
check_ws() {
206
206
        local URL="$1"
207
207
        local ret=""
 
208
        local soap_error=""
208
209
 
209
210
        if [ -z "$URL" ]; then
210
211
                echo "check_ws: need a URL!"
219
220
                fi
220
221
                eval "$2=\"`$WGET -o /dev/null -T 10 -t 1 -O - \"$URL\"|sed 's;</euca:item>;\n;g'|grep euca:name |sed 's;.*<euca:name>\(.*\)</euca:name><euca:detail>\(.*\)</euca:detail>.*;\1 \2;'`\""
221
222
                ret="$?"
222
 
                return $ret
223
223
        else
224
224
                if [ "$VERBOSE" = "Y" ]; then
225
225
                        echo "$WGET -o /dev/null -T 10 -t 1 -O - \"$URL\" |grep faultstring | sed 's:.*<faultstring>\(.*\)</faultstring>.*:\1:'"
226
226
                fi
227
 
                ret="`$WGET -o /dev/null -T 10 -t 1 -O - \"$URL\" |grep faultstring | sed 's:.*<faultstring>\(.*\)</faultstring>.*:\1:'`"
228
 
        fi
229
 
        if test -n "$ret" ; then
230
 
                echo $ret
231
 
                return 1
232
 
        fi
233
 
        return 0
 
227
                soap_error="`$WGET -o /dev/null -T 10 -t 1 -O - \"$URL\"`"
 
228
                ret="$?"
 
229
                soap_error="`echo $soap_error |grep faultstring | sed 's:.*<faultstring>\(.*\)</faultstring>.*:\1:'`"
 
230
                if test -n "$soap_error" ; then
 
231
                        echo $soap_error
 
232
                        ret="1"
 
233
                fi
 
234
        fi
 
235
        return $ret
234
236
}
235
237
 
236
238
component_sync_keys() {