change UploadResults to return IServers, update users to match

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / immutable / filenode.py

diff --git a/src/allmydata/immutable/filenode.py b/src/allmydata/immutable/filenode.py
index e159be033329637ff30a557b63806395541df9d2..4afeeda3c807a2124506d0e74f0f3cd7980506ee 100644 (file)
--- a/src/allmydata/immutable/filenode.py
+++ b/src/allmydata/immutable/filenode.py
@@ -115,12 +115,13 @@ class CiphertextFileNode:
                     prr = CheckResults(cr.uri, cr.storage_index)
                     prr.data = copy.deepcopy(cr.data)
 
+                    servers_responding = set(prr.data['servers-responding'])
                     sm = prr.data['sharemap']
                     assert isinstance(sm, DictOfSets), sm
-                    sm.update(ur.get_sharemap())
-                    servers_responding = set(prr.data['servers-responding'])
-                    for shnum, serverids in ur.get_sharemap().items():
-                        servers_responding.update(serverids)
+                    for shnum, servers in ur.get_sharemap().items():
+                        for s in servers:
+                            sm.add(shnum, s.get_serverid())
+                            servers_responding.add(s.get_serverid())
                     servers_responding = sorted(servers_responding)
                     prr.data['servers-responding'] = servers_responding
                     prr.data['count-shares-good'] = len(sm)