Merge remote-tracking branch 'upstream/master' into skeletongobblin

[mediagoblin.git] / mediagoblin / gmg_commands / util.py

diff --git a/mediagoblin/gmg_commands/util.py b/mediagoblin/gmg_commands/util.py
index 004f9e49da17f5ba6eef24bb1a240577383ff1fb..63e39ca9523ef48b63aad0048c2d93be48ecc2f8 100644 (file)
--- a/mediagoblin/gmg_commands/util.py
+++ b/mediagoblin/gmg_commands/util.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -35,6 +35,6 @@ def prompt_if_not_set(variable, text, password=False):
         if not password:
             variable=raw_input(text + u' ')
         else:
-            variable=getpass.getpass(text)
-    
+            variable=getpass.getpass(text + u' ')
+
     return variable