From 1f64fde8f80d691d07fa93f2756812412dfafa2e Mon Sep 17 00:00:00 2001 From: Ryan Pessa Date: Sun, 8 May 2016 17:43:41 -0500 Subject: [PATCH 1/2] fix changing android branch --- buildozer/targets/android.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py index 62f0eeb..2b1be7c 100644 --- a/buildozer/targets/android.py +++ b/buildozer/targets/android.py @@ -485,10 +485,12 @@ class TargetAndroid(Target): cwd=self.buildozer.platform_dir) elif self.platform_update: cmd('git clean -dxf', cwd=pa_dir) - cmd('git pull origin {}'.format(source), cwd=pa_dir) - - if source: - cmd('git checkout {branch}'.format(branch=source), cwd=pa_dir) + current_branch = cmd('git rev-parse --abbrev-ref HEAD', get_stdout=True, cwd=pa_dir)[0].strip() + if current_branch == source: + cmd('git pull', cwd=pa_dir) + else: + cmd('git fetch --tags origin {0}:{0}'.format(source), cwd=pa_dir) + cmd('git checkout {}'.format(source), cwd=pa_dir) self._install_apache_ant() self._install_android_sdk() From 20f5171a6dffe25a4bf71335d60409316aaa2740 Mon Sep 17 00:00:00 2001 From: Ryan Pessa Date: Sun, 8 May 2016 17:45:26 -0500 Subject: [PATCH 2/2] fix long lines --- buildozer/targets/android.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py index 2b1be7c..4b8ef13 100644 --- a/buildozer/targets/android.py +++ b/buildozer/targets/android.py @@ -485,11 +485,13 @@ class TargetAndroid(Target): cwd=self.buildozer.platform_dir) elif self.platform_update: cmd('git clean -dxf', cwd=pa_dir) - current_branch = cmd('git rev-parse --abbrev-ref HEAD', get_stdout=True, cwd=pa_dir)[0].strip() + current_branch = cmd('git rev-parse --abbrev-ref HEAD', + get_stdout=True, cwd=pa_dir)[0].strip() if current_branch == source: cmd('git pull', cwd=pa_dir) else: - cmd('git fetch --tags origin {0}:{0}'.format(source), cwd=pa_dir) + cmd('git fetch --tags origin {0}:{0}'.format(source), + cwd=pa_dir) cmd('git checkout {}'.format(source), cwd=pa_dir) self._install_apache_ant()