ok lets try that again

This commit is contained in:
ed 2023-08-26 19:07:23 +00:00
parent 5a38311481
commit c1c8dc5e82

View file

@ -3303,8 +3303,9 @@ class HttpCli(object):
sub = self.gen_tree("/".join([top, excl]).strip("/"), target) sub = self.gen_tree("/".join([top, excl]).strip("/"), target)
ret["k" + quotep(excl)] = sub ret["k" + quotep(excl)] = sub
vfs = self.asrv.vfs
try: try:
vn, rem = self.asrv.vfs.get(top, self.uname, True, False) vn, rem = vfs.get(top, self.uname, True, False)
fsroot, vfs_ls, vfs_virt = vn.ls( fsroot, vfs_ls, vfs_virt = vn.ls(
rem, rem,
self.uname, self.uname,
@ -3317,7 +3318,7 @@ class HttpCli(object):
for v in self.rvol: for v in self.rvol:
d1, d2 = v.rsplit("/", 1) if "/" in v else ["", v] d1, d2 = v.rsplit("/", 1) if "/" in v else ["", v]
if d1 == top: if d1 == top:
vfs_virt[d2] = self.asrv.vfs # typechk, value never read vfs_virt[d2] = vfs # typechk, value never read
dirs = [] dirs = []
@ -3332,7 +3333,8 @@ class HttpCli(object):
for x in vfs_virt: for x in vfs_virt:
if x != excl: if x != excl:
try: try:
bos.stat(vn.nodes[x].realpath) dvn, drem = vfs.get(vjoin(top, x), self.uname, True, False)
bos.stat(dvn.canonical(drem, False))
except: except:
x += "\n" x += "\n"
dirs.append(x) dirs.append(x)