15964: Remove qr1hi from a few more places. Delete unused includes.

[arvados.git] / services / arv-web / arv-web.py

diff --git a/services/arv-web/arv-web.py b/services/arv-web/arv-web.py
index 482a5776d92d08306ef8327339200418b887c723..55b710a754dbc745b185327b9009bab4688087f8 100755 (executable)
--- a/services/arv-web/arv-web.py
+++ b/services/arv-web/arv-web.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
 # arv-web enables you to run a custom web service from the contents of an Arvados collection.
 #
@@ -72,7 +75,7 @@ class ArvWeb(object):
                         et = 'add'
                     else:
                         et = 'remove'
-                if ev['properties']['new_attributes']['expires_at'] is not None:
+                if ev['properties']['new_attributes']['trash_at'] is not None:
                     et = 'remove'
 
             self.evqueue.put((self.project, et, ev['object_uuid']))
@@ -83,7 +86,7 @@ class ArvWeb(object):
     def run_fuse_mount(self):
         self.mountdir = tempfile.mkdtemp()
 
-        self.operations = Operations(os.getuid(), os.getgid(), "utf-8")
+        self.operations = Operations(os.getuid(), os.getgid(), self.api, "utf-8")
         self.cdir = CollectionDirectory(llfuse.ROOT_INODE, self.operations.inodes, self.api, 2, self.collection)
         self.operations.inodes.add_entry(self.cdir)