fix filekeys not appearing in up2k in world-writable vols

This commit is contained in:
ed 2023-11-19 11:19:08 +00:00
parent ef33ce94cd
commit 3c36727d07

View file

@ -945,7 +945,7 @@ class Up2k(object):
(oldcfg,) = c.fetchone() (oldcfg,) = c.fetchone()
except: except:
oldcfg = "" oldcfg = ""
if oldcfg != vcfg: if oldcfg != vcfg:
cur.execute("delete from kv where k = 'volcfg'") cur.execute("delete from kv where k = 'volcfg'")
cur.execute("delete from dh") cur.execute("delete from dh")
@ -2659,7 +2659,12 @@ class Up2k(object):
not ret["hash"] not ret["hash"]
and "fk" in vfs.flags and "fk" in vfs.flags
and not self.args.nw and not self.args.nw
and (cj["user"] in vfs.axs.uread or cj["user"] in vfs.axs.upget) and (
cj["user"] in vfs.axs.uread
or cj["user"] in vfs.axs.upget
or "*" in vfs.axs.uread
or "*" in vfs.axs.upget
)
): ):
alg = 2 if "fka" in vfs.flags else 1 alg = 2 if "fka" in vfs.flags else 1
ap = absreal(djoin(job["ptop"], job["prel"], job["name"])) ap = absreal(djoin(job["ptop"], job["prel"], job["name"]))