From 2940dd71abb8fa3755c978d40f96ff5ccfcb5808 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Sat, 25 Aug 2018 04:32:02 -0700 Subject: [PATCH] Fix query in update/rename labels, allow user to keep old label (#783) * Fix query in update/rename labels, allow user to keep old label * Drop keepoldlabel --- src/gam.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gam.py b/src/gam.py index fdc7478d..ced959e9 100755 --- a/src/gam.py +++ b/src/gam.py @@ -5743,8 +5743,8 @@ def renameLabels(users): except GAPI_aborted: if merge: print u' Merging %s label to existing %s label' % (label[u'name'], new_label_name) - q = u'label:"%s"' % label[u'name'] - messages_to_relabel = callGAPIpages(gmail.users().messages(), u'list', u'messages', userId=user, q=q) + messages_to_relabel = callGAPIpages(gmail.users().messages(), u'list', u'messages', + userId=user, q=u'label:%s' % label[u'name'].lower().replace(u'/', u'-').replace(u' ', u'-')) if len(messages_to_relabel) > 0: for new_label in labels[u'labels']: if new_label[u'name'].lower() == new_label_name.lower():