Bug found on cod from sarra component. Prevents having to add patch t…

…o computeIdentity
MetPX · Aug 7, 2024 · 9c580d5 · 9c580d5
1 parent dd87191
commit 9c580d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/sarracenia/__init__.py b/sarracenia/__init__.py
@@ -425,10 +425,9 @@ def computeIdentity(msg, path, o, offset=0, data=None) -> None:
                 if xattr.get('mtime') >= msg['mtime']:
                     logger.debug("mtime remembered by xattr")
                     fxainteg = xattr.get('identity')
-                    if fxainteg != 'null':
-                        if fxainteg['method'] == o.identity_method: 
-                            msg['identity'] = fxainteg
-                            return
+                    if fxainteg['method'] == o.identity_method: 
+                        msg['identity'] = fxainteg
+                        return
                     logger.debug("xattr different method than on disk")
                     calc_method = o.identity_method
                 else:

diff --git a/sarracenia/flow/__init__.py b/sarracenia/flow/__init__.py
@@ -2096,7 +2096,10 @@ def download(self, msg, options) -> bool:
             if self.o.identity_method.startswith('cod,'):
                 download_algo = self.o.identity_method[4:]
             elif 'identity' in msg:
-                download_algo = msg['identity']['method']
+                if msg['identity']['method'] == 'cod':
+                    download_algo = msg['identity']['value']
+                else:
+                    download_algo = msg['identity']['method']
             else:
                 download_algo = None