From d80814f850cb646e26d56195e1949bfde32a2fd8 Mon Sep 17 00:00:00 2001 From: Andrew McDonnell Date: Sat, 20 Feb 2016 18:58:46 +1030 Subject: [PATCH 1/2] Fail with useful error rather than crashing with backtrace when p4a_dir is invalid --- 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 576ade8..7782cd8 100644 --- a/buildozer/targets/android.py +++ b/buildozer/targets/android.py @@ -464,8 +464,10 @@ class TargetAndroid(Target): if system_p4a_dir: self.pa_dir = pa_dir = system_p4a_dir if not self.buildozer.file_exists(pa_dir): - self.buildozer.critical( - 'Path for android.p4a_dir doesnt exists') + self.buildozer.error( + 'Path for android.p4a_dir does not exist') + self.buildozer.error('') + raise BuildozerException() else: if not self.buildozer.file_exists(pa_dir): cmd( From 0f29a24b1847ddb0d60921efdae65fbebc94399a Mon Sep 17 00:00:00 2001 From: Andrew McDonnell Date: Sat, 20 Feb 2016 19:07:03 +1030 Subject: [PATCH 2/2] Handle tilde for user home in android p4a_dir path --- buildozer/targets/android.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py index 7782cd8..b9696d4 100644 --- a/buildozer/targets/android.py +++ b/buildozer/targets/android.py @@ -459,8 +459,8 @@ class TargetAndroid(Target): cmd = self.buildozer.cmd self.pa_dir = pa_dir = join(self.buildozer.platform_dir, self.p4a_directory) - system_p4a_dir = self.buildozer.config.getdefault('app', - 'android.p4a_dir') + system_p4a_dir = expanduser(self.buildozer.config.getdefault('app', + 'android.p4a_dir')) if system_p4a_dir: self.pa_dir = pa_dir = system_p4a_dir if not self.buildozer.file_exists(pa_dir):