From e855eb08f6183f4c917b83e30ae7591d547a243f Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 14 Nov 2015 12:24:58 -0500
Subject: [PATCH] travis-ci fix google play deploy

-explicitly set correct s3 region
---
 .travis.yml                 | 4 +++-
 tools/google_play_upload.py | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d4e15b723..3bc48c222 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -123,7 +123,7 @@ script:
 after_success:
   - if [[ "${TRAVIS_OS_NAME}" = "android" && "${TRAVIS_PULL_REQUEST}" = "false" && "${TRAVIS_BRANCH}" = "master" ]]; then
          pip install --user google-api-python-client PyOpenSSL
-      && openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in Google_Play_Android_Developer-bb93ae7d61ca.p12.enc -out android/Google_Play_Android_Developer-bb93ae7d61ca.p12 -d
+      && cd ${SHADOW_BUILD_DIR} && openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in ${TRAVIS_BUILD_DIR}/Google_Play_Android_Developer-bb93ae7d61ca.p12.enc -out Google_Play_Android_Developer-bb93ae7d61ca.p12 -d
       && ${TRAVIS_BUILD_DIR}/tools/google_play_upload.py org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/qgroundcontrol.apk
       ;
     fi
@@ -137,6 +137,7 @@ deploy:
     local_dir: ${SHADOW_BUILD_DIR}/release/package
     upload-dir: ${TRAVIS_BRANCH}
     acl: public_read
+    region: us-west-2
     skip_cleanup: true
     on:
       all_branches: true
@@ -160,6 +161,7 @@ deploy:
     local_dir: ${TRAVIS_BUILD_DIR}/src/html
     upload-dir: doxygen
     acl: public_read
+    region: us-west-2
     skip_cleanup: true
     branch: master
     on:
diff --git a/tools/google_play_upload.py b/tools/google_play_upload.py
index 9d0ce4156..8017c9d58 100755
--- a/tools/google_play_upload.py
+++ b/tools/google_play_upload.py
@@ -39,7 +39,7 @@ argparser.add_argument('apk_file',
 def main():
   # Load the key in PKCS 12 format that you downloaded from the Google APIs
   # Console when you created your Service account.
-  f = file('android/Google_Play_Android_Developer-bb93ae7d61ca.p12', 'rb')
+  f = file('Google_Play_Android_Developer-bb93ae7d61ca.p12', 'rb')
   key = f.read()
   f.close()
 
-- 
2.22.0