Changeset 6886

Timestamp:

Apr 23, 2009, 3:25:26 PM (16 years ago)

Author:

rwilson

Message:

Better error handling.

File:

• anuga_core/source/anuga/utilities/system_tools.py (modified) (5 diffs)

anuga_core/source/anuga/utilities/system_tools.py

@@ -341 +341 @@
 # @param auth Auth tuple (httpproxy, proxyuser, proxypass).
 # @param blocksize Read file in this block size.
-# @return 'auth' tuple for subsequent calls, if successful, else False.
+# @return (True, auth) if successful, else (False, auth).
 # @note If 'auth' not supplied, will prompt user.
 # @note Will try using environment variable HTTP_PROXY for proxy server.
@@ -365 +365 @@
     try:
         urllib.urlretrieve(file_url, file_name)
-        return None     # no proxy, no auth required
+        return (True, auth)     # no proxy, no auth required
     except IOError, e:
         if e[1] == 407:     # proxy error
@@ -371 +371 @@
         elif e[1][0] == 113:  # no route to host
             print 'No route to host for %s' % file_url
-            return False    # return False
+            return (False, auth)    # return False
         else:
             print 'Unknown connection error to %s' % file_url
-            return False
+            return (False, auth)
 
     # We get here if there was a proxy error, get file through the proxy
@@ -423 +423 @@
     try:
         webget = urllib2.urlopen(file_url)
-    except urllib2.HTTPError:
-        return False
+    except urllib2.HTTPError, e:
+        print 'Error received from proxy:\n%s' % str(e)
+        print 'Possibly the user/password is wrong.'
+        return (False, auth)
 
     # transfer file to local filesystem
@@ -437 +439 @@
 
     # return successful auth info
-    return (httpproxy, proxyuser, proxypass)
+    return (True, (httpproxy, proxyuser, proxypass))