From cb777ad14f12a24900500b0e41be378865a1934d Mon Sep 17 00:00:00 2001 From: david-sarah <david-sarah@jacaranda.org> Date: Tue, 9 Nov 2010 16:53:36 -0800 Subject: [PATCH] tahoe_mv.py: use do_http, not urllib.openurl, in order to avoid connecting to the webapi server via a proxy. refs #1253 --- src/allmydata/scripts/tahoe_mv.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/allmydata/scripts/tahoe_mv.py b/src/allmydata/scripts/tahoe_mv.py index 3be219d6..08618cb1 100644 --- a/src/allmydata/scripts/tahoe_mv.py +++ b/src/allmydata/scripts/tahoe_mv.py @@ -28,7 +28,11 @@ def mv(options, mode="move"): if from_path: from_url += "/" + escape_path(from_path) # figure out the source cap - data = urllib.urlopen(from_url + "?t=json").read() + resp = do_http("GET", from_url + "?t=json") + if not re.search(r'^2\d\d$', str(resp.status)): + print >>stderr, format_http_error("Error", resp) + return 1 + data = resp.read() nodetype, attrs = simplejson.loads(data) cap = to_str(attrs.get("rw_uri") or attrs["ro_uri"]) -- 2.45.2