Don't install bindep if there's no bindep file

Change-Id: I60f229f06e9655bead1f38a8e2d70c3048c0269b
This commit is contained in:
Monty Taylor 2017-09-05 17:32:12 -05:00
parent 60328fef8c
commit a18999e002
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
2 changed files with 25 additions and 20 deletions

View File

@ -0,0 +1,21 @@
- name: Look for bindep command
stat:
path: "{{ bindep_command }}"
when: bindep_command is defined
register: bindep_command_stat
- name: Check for system bindep
args:
executable: /bin/bash
command: type -p bindep
failed_when: false
register: bindep_command_type
when: >-
bindep_command is not defined
or bindep_command_stat is defined
and not bindep_command_stat.stat.exists
- name: Define bindep_command fact
set_fact:
bindep_command: "{{ bindep_command_type.stdout }}"
when: bindep_command_type|succeeded and not bindep_command_type|skipped

View File

@ -1,29 +1,13 @@
--- ---
- name: Look for bindep command - include: find.yaml
stat: when: bindep_file is not defined
path: "{{ bindep_command }}"
when: bindep_command is defined
register: bindep_command_stat
- name: Check for system bindep - include: find-bindep.yaml
args: when: bindep_file is defined
executable: /bin/bash
command: type -p bindep
ignore_errors: yes
register: bindep_command_type
when: bindep_command is not defined or not bindep_command_stat.stat.exists
- name: Define bindep_command fact
set_fact:
bindep_command: "{{ bindep_command_type.stdout }}"
when: bindep_command_type|succeeded and not bindep_command_type|skipped
- include: install.yaml - include: install.yaml
when: bindep_command is not defined when: bindep_command is not defined
- include: find.yaml
when: bindep_file is not defined
- name: Define bindep_command fact - name: Define bindep_command fact
set_fact: set_fact:
bindep_run: "{{ bindep_command }} -b -f {{ bindep_file }} {{ bindep_profile }}" bindep_run: "{{ bindep_command }} -b -f {{ bindep_file }} {{ bindep_profile }}"