Fix iquest printf parameter and filter

wtsi-npg · Nov 1, 2024 · 5500a99 · 5500a99
1 parent f697050
commit 5500a99
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/npg_irods/ont.py b/src/npg_irods/ont.py
@@ -451,7 +451,7 @@ def find_run_collections(
     args = []
     if zone is not None:
         args.extend(["-z", shlex.quote(zone)])
-    args.append("%s/%s")
+    args.append("%s")
 
     query = (
         "select COLL_NAME where "
@@ -461,7 +461,14 @@ def find_run_collections(
         f"COLL_CREATE_TIME <= '{int(until.timestamp()) :>011}'"
     )
 
-    return [Collection(p) for p in iquest(*args, query).splitlines()]
+    # iquest mixes logging and data in its output
+    ignore = f"Zone is {zone}" if zone is not None else "Zone is"
+
+    return [
+        Collection(p)
+        for p in iquest(*args, query).splitlines()
+        if not p.strip().startswith(ignore)
+    ]
 
 
 def tag_index_from_id(tag_identifier: str) -> int: