From cd766d90e412fd91f5f0217547f16f9dde6ebecd Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Thu, 24 Dec 2015 23:04:40 -0800 Subject: [PATCH 1/2] Fix doVacation problem --- src/gam.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gam.py b/src/gam.py index 941f9809..97f8a899 100755 --- a/src/gam.py +++ b/src/gam.py @@ -4884,9 +4884,9 @@ def doWebClips(users): def doVacation(users): subject = message = u'' if sys.argv[4].lower() in true_values: - enable = u'true' + enable = True elif sys.argv[4].lower() in false_values: - enable = u'false' + enable = False else: print u'ERROR: value for "gam vacation" must be true or false, got %s' % sys.argv[4] sys.exit(2) From 2df3aef52dac2a56c6cf2533175f42552819cca3 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 25 Dec 2015 05:42:47 -0500 Subject: [PATCH 2/2] more fixes to doVacation --- src/gam.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gam.py b/src/gam.py index 97f8a899..629fa4ec 100755 --- a/src/gam.py +++ b/src/gam.py @@ -4890,7 +4890,7 @@ def doVacation(users): else: print u'ERROR: value for "gam vacation" must be true or false, got %s' % sys.argv[4] sys.exit(2) - contacts_only = domain_only = u'false' + contacts_only = domain_only = False start_date = end_date = None i = 5 while i < len(sys.argv): @@ -4901,10 +4901,10 @@ def doVacation(users): message = sys.argv[i+1] i += 2 elif sys.argv[i].lower() == u'contactsonly': - contacts_only = u'true' + contacts_only = True i += 1 elif sys.argv[i].lower() == u'domainonly': - domain_only = u'true' + domain_only = True i += 1 elif sys.argv[i].lower() == u'startdate': start_date = sys.argv[i+1]