crowdin: Don't autodetect default branch
* This can easily lead to failures so add branch as an argument
Change-Id: Id29b4c65c551e490ee7206de22cff337ba7b8d95
diff --git a/README.mkdn b/README.mkdn
index 7a51aeb..101ea78 100644
--- a/README.mkdn
+++ b/README.mkdn
@@ -26,7 +26,7 @@
Edit crowdin/config_cm.yaml to set the api key & your current CyanogenMod path.
Execute:
- ./crowdin_sync.py --username your_gerrit_username [--no-download|--no-upload]
+ ./crowdin_sync.py --username your_gerrit_username --branch cm_version [--no-download|--no-upload]
Bugs
----
diff --git a/crowdin_sync.py b/crowdin_sync.py
index e4f34f8..713c16d 100755
--- a/crowdin_sync.py
+++ b/crowdin_sync.py
@@ -35,11 +35,6 @@
############################################ FUNCTIONS #############################################
-def get_default_branch(xml):
- xml_default = xml.getElementsByTagName('default')[0]
- xml_default_revision = xml_default.attributes['revision'].value
- return re.search('refs/heads/(.*)', xml_default_revision).groups()[0]
-
def push_as_commit(path, name, branch, username):
print('Committing ' + name + ' on branch ' + branch)
@@ -82,12 +77,14 @@
parser = argparse.ArgumentParser(description='Synchronising CyanogenMod\'s translations with Crowdin')
sync = parser.add_mutually_exclusive_group()
parser.add_argument('-u', '--username', help='Gerrit username', required=True)
+parser.add_argument('-b', '--branch', help='CyanogenMod branch', required=True)
sync.add_argument('--no-upload', action='store_true', help='Only download CM translations from Crowdin')
sync.add_argument('--no-download', action='store_true', help='Only upload CM source translations to Crowdin')
args = parser.parse_args()
argsdict = vars(args)
username = argsdict['username']
+default_branch = argsdict['branch']
############################################# PREPARE ##############################################
@@ -114,10 +111,6 @@
print('Loading: android/default.xml')
xml_android = minidom.parse('android/default.xml')
-# Default branch
-default_branch = get_default_branch(xml_android)
-print('Default branch: ' + default_branch)
-
# Check for crowdin/extra_packages_' + default_branch + '.xml
if not os.path.isfile('crowdin/extra_packages_' + default_branch + '.xml'):
sys.exit('You have no crowdin/extra_packages_' + default_branch + '.xml. Terminating.')