From 2d2ba0addf18e11c9cfd2805cc8b36c78b3da071 Mon Sep 17 00:00:00 2001 From: Max Risuhin Date: Wed, 15 Jan 2020 13:10:55 -0800 Subject: [PATCH] Fix gdrive multiple parents file list query --- dvc/remote/gdrive.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dvc/remote/gdrive.py b/dvc/remote/gdrive.py index 8b788c684..aa87f1bbd 100644 --- a/dvc/remote/gdrive.py +++ b/dvc/remote/gdrive.py @@ -261,8 +261,11 @@ class RemoteGDrive(RemoteBASE): def get_remote_item(self, name, parents_ids): if not parents_ids: return None - query = " or ".join( - "'{}' in parents".format(parent_id) for parent_id in parents_ids + query = "({})".format( + " or ".join( + "'{}' in parents".format(parent_id) + for parent_id in parents_ids + ) ) query += " and trashed=false and title='{}'".format(name) @@ -331,8 +334,10 @@ class RemoteGDrive(RemoteBASE): if not self.cached_ids: return - query = " or ".join( - "'{}' in parents".format(dir_id) for dir_id in self.cached_ids + query = "({})".format( + " or ".join( + "'{}' in parents".format(dir_id) for dir_id in self.cached_ids + ) ) query += " and trashed=false"