Merge branch 'master' of ssh://github.com/kivy/buildozer

buildozer/targets/android_new.py

@@ -31,6 +31,9 @@ class TargetAndroidNew(TargetAndroid):
         hook = self.buildozer.config.getdefault("app", "p4a.hook", None)
         if hook is not None:
             self.extra_p4a_args += ' --hook={}'.format(realpath(hook))
+        port = self.buildozer.config.getdefault('app', 'p4a.port', None)
+        if port is not None:
+            self.extra_p4a_args += ' --port={}'.format(port)
 
     def _p4a(self, cmd, **kwargs):
         if not hasattr(self, "pa_dir"):

buildozer/targets/osx.py

@@ -60,12 +60,19 @@ class TargetOSX(Target):
         else:
             if not exists(join(cwd, 'Kivy{}.dmg'.format(py_branch))):
                 self.buildozer.info('Downloading kivy...')
-                check_call(
-                    ('curl', '-L', '-o', 'Kivy{}.dmg'.format(py_branch),
+                status_code = check_output(
+                    ('curl', '-L', '--write-out', '%{http_code}', '-o', 'Kivy{}.dmg'.format(py_branch),
                     'http://kivy.org/downloads/{}/Kivy-{}-osx-python{}.dmg'\
                     .format(current_kivy_vers, current_kivy_vers, py_branch)),
                     cwd=cwd)
 
+                if status_code == "404":
+                    self.buildozer.error(
+                        "Unable to download the Kivy App. Check osx.kivy_version in your buildozer.spec, and verify "
+                        "Kivy servers are accessible. http://kivy.org/downloads/")
+                    check_call(("rm", "Kivy{}.dmg".format(py_branch)), cwd=cwd)
+                    exit(1)
+
             self.buildozer.info('Extracting and installing Kivy...')
             check_call(('hdiutil', 'attach', cwd + '/Kivy{}.dmg'.format(py_branch)))
             check_call(('cp', '-a', '/Volumes/Kivy/Kivy.app', './Kivy.app'), cwd=cwd)