From: Brian Warner <warner@lothar.com>
Date: Fri, 15 Jun 2007 09:34:24 +0000 (-0700)
Subject: webish: when mounting a shared directory, don't automatically move to it
X-Git-Tag: allmydata-tahoe-0.4.0~35
X-Git-Url: https://git.rkrishnan.org/module-simplejson.tests.html?a=commitdiff_plain;h=a00bde050bc3362054298279e7eb2f830f7d3b8c;p=tahoe-lafs%2Ftahoe-lafs.git

webish: when mounting a shared directory, don't automatically move to it
---

diff --git a/src/allmydata/webish.py b/src/allmydata/webish.py
index 618c34b0..ffa0fa2e 100644
--- a/src/allmydata/webish.py
+++ b/src/allmydata/webish.py
@@ -280,7 +280,7 @@ class Directory(rend.Page):
 
     def mount(self, name, furl):
         d = self._dirnode.attach_shared_directory(name, furl)
-        d.addCallback(lambda done: url.here.child(name))
+        #d.addCallback(lambda done: url.here.child(name))
         return d
 
     def child__delete(self, ctx):
@@ -288,9 +288,7 @@ class Directory(rend.Page):
         args = inevow.IRequest(ctx).args
         name = args["name"][0]
         d = self._dirnode.remove(name)
-        def _deleted(res):
-            return url.here.up()
-        d.addCallback(_deleted)
+        d.addCallback(lambda done: url.here.up())
         return d
 
 class WebDownloadTarget: