From 19229b121567e3bb2eb1e77af16eae333c165ef4 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Sat, 16 Nov 2019 18:38:21 +0000 Subject: [PATCH] drive: fix --drive-root-folder-id with team/shared drives Before this change rclone used the team_drive ID as the root if set even if the root_folder_id was set too. This change uses the root_folder_id in preference over the team_drive which restores the functionality. This problem was introduced by ba7c2ac443233ec4 Fixes #3742 --- backend/drive/drive.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/drive/drive.go b/backend/drive/drive.go index cc8185395..4aa82214e 100644 --- a/backend/drive/drive.go +++ b/backend/drive/drive.go @@ -1021,11 +1021,11 @@ func NewFs(name, path string, m configmap.Mapper) (fs.Fs, error) { } // set root folder for a team drive or query the user root folder - if f.isTeamDrive { - f.rootFolderID = f.opt.TeamDriveID - } else if opt.RootFolderID != "" { + if opt.RootFolderID != "" { // override root folder if set or cached in the config f.rootFolderID = opt.RootFolderID + } else if f.isTeamDrive { + f.rootFolderID = f.opt.TeamDriveID } else { // Look up the root ID and cache it in the config rootID, err := f.getRootID()