[incubator-openwhisk] branch master updated: Add -o option to overwrite target files (#3442)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 08d1c78  Add -o option to overwrite target files (#3442)
08d1c78 is described below

commit 08d1c785cdc67e869a86ca8df14c76a927cdc753
Author: ningyougang <41...@qq.com>
AuthorDate: Mon Mar 26 20:10:05 2018 +0800

    Add -o option to overwrite target files (#3442)
    
    Use -o option to overwrite files when unzipping to avoid collision.
---
 ansible/roles/cli/tasks/deploy.yml   | 2 +-
 ansible/roles/kafka/tasks/deploy.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/cli/tasks/deploy.yml b/ansible/roles/cli/tasks/deploy.yml
index 49630ad..72b9a9c 100644
--- a/ansible/roles/cli/tasks/deploy.yml
+++ b/ansible/roles/cli/tasks/deploy.yml
@@ -69,5 +69,5 @@
 # Use old good unzip instead of unarchive due to a known issue on MacOS
 # https://github.com/ansible/ansible-modules-core/issues/3952
 - name: "Unarchive the individual zipfiles into binaries"
-  shell: unzip {{ item.path }} -d {{ item.path | dirname }}
+  shell: unzip -o {{ item.path }} -d {{ item.path | dirname }}
   with_items: "{{ individual_zipfiles.files }}"
diff --git a/ansible/roles/kafka/tasks/deploy.yml b/ansible/roles/kafka/tasks/deploy.yml
index f7c3270..8ae7b72 100644
--- a/ansible/roles/kafka/tasks/deploy.yml
+++ b/ansible/roles/kafka/tasks/deploy.yml
@@ -79,7 +79,7 @@
     env: "{{ kafka_env_vars }}"
     ports:
       - "{{ kafka.port + groups['kafkas'].index(inventory_hostname) }}:{{ kafka.port + groups['kafkas'].index(inventory_hostname) }}"
-      - "{{ kafka.advertisedPort  + groups['kafkas'].index(inventory_hostname) }}:{{ kafka.advertisedPort + groups['kafkas'].index(inventory_hostname) }}"
+      - "{{ kafka.advertisedPort + groups['kafkas'].index(inventory_hostname) }}:{{ kafka.advertisedPort + groups['kafkas'].index(inventory_hostname) }}"
     volumes:
       - "{{ config_root_dir }}/kafka/certs:/config"
 

-- 
To stop receiving notification emails like this one, please contact
rabbah@apache.org.