From caa0e5e90cf9b4720f47ff988072872aaed685b4 Mon Sep 17 00:00:00 2001
From: Martin Zibricky <mzibr.public@gmail.com>
Date: Tue, 26 Jun 2012 00:39:49 +0200
Subject: [PATCH] Add cli options to specify transifex login on command line.

---
 osx/macosx-builder.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osx/macosx-builder.py b/osx/macosx-builder.py
index fe36df7..74d319d 100644
--- a/osx/macosx-builder.py
+++ b/osx/macosx-builder.py
@@ -225,6 +225,10 @@ class MacosxBuilder(object):
         parser.add_argument('--transifex',
             dest='update_translations', action='store_true', default=False,
             help='Update the language translation from Transifex.')
+        parser.add_argument('--transifex-user',
+            dest='transifex_user', help='Transifex username.')
+        parser.add_argument('--transifex-pass',
+            dest='transifex_pass', help='Transifex password.')
         parser.add_argument('-v', '--verbose', dest='verbose',
             action='store_true', default=False,
             help='Print out additional information.')
@@ -372,8 +376,7 @@ class MacosxBuilder(object):
             raise Exception(u'Error running bzr log')
         output_ascii = unicode(output, errors=u'ignore')
         latest = output_ascii.split(u':')[0]
-        version_string = latest == revision and tag or \
-            u'%s-bzr%s' % (tag, latest)
+        version_string = u'%s-bzr%s' % (tag, latest)
         self.version_string = version_string
         self.version_tag = tag
         version_file = open(os.path.join(self.dist_path, u'.version'), u'w')
@@ -452,8 +455,14 @@ class MacosxBuilder(object):
             raise Exception(u'No option named "username" found.')
         if not self.config.has_option('transifex', 'password'):
             raise Exception(u'No option named "password" found.')
-        username = self.config.get(u'transifex', u'username')
-        password = self.config.get(u'transifex', u'password')
+        if self.args.transifex_user:
+            username = self.args.transifex_user
+        else:
+            username = self.config.get(u'transifex', u'username')
+        if self.args.transifex_pass:
+            password = self.args.transifex_pass
+        else:
+            password = self.config.get(u'transifex', u'password')
         os.chdir(os.path.split(self.i18n_utils)[0])
         translation_utils = Popen([self.python, self.i18n_utils, u'-qdpu',
             u'-U', username, u'-P', password])