From 138904ef93b0f7afdc4ae33b1388e2b74c868c1a Mon Sep 17 00:00:00 2001
From: "J. Richard Barnette" <jrbarnette@chromium.org>
Date: Thu, 5 Aug 2010 11:03:37 -0700
Subject: [PATCH] Fix gsdcurl to correctly URL-quote a password passed via
 GSDCURL_PASSWORD

BUG=none
TEST=use this script with a (correct) password that includes punctuation such as one of these: $&+,/:;=?@

Review URL: http://codereview.chromium.org/3058046
---
 bin/cros_gsdcurl.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/cros_gsdcurl.py b/bin/cros_gsdcurl.py
index 38bafb569a..0fe4bf9d69 100755
--- a/bin/cros_gsdcurl.py
+++ b/bin/cros_gsdcurl.py
@@ -26,11 +26,11 @@ def Authenticate():
   passwd = os.environ.get('GSDCURL_PASSWORD')
   if passwd is None:
     sys.stderr.write('Password: ')
-    passwd = urllib.quote_plus(getpass.getpass(prompt=''))
+    passwd = getpass.getpass(prompt='')
   cmd = [
       'curl', '--silent', 'https://www.google.com/accounts/ClientLogin',
       '-d', 'Email=' + username,
-      '-d', 'Passwd=' + passwd,
+      '-d', 'Passwd=' + urllib.quote_plus(passwd),
       '-d', 'accountType=GOOGLE',
       '-d', 'source=Google-gsdcurl-ver1',
       '-d', 'service=cds',