Don't install bindep if there's no bindep file
Change-Id: I60f229f06e9655bead1f38a8e2d70c3048c0269b
This commit is contained in:
parent
60328fef8c
commit
a18999e002
21
roles/bindep/tasks/find-bindep.yaml
Normal file
21
roles/bindep/tasks/find-bindep.yaml
Normal 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
|
@ -1,29 +1,13 @@
|
||||
---
|
||||
- name: Look for bindep command
|
||||
stat:
|
||||
path: "{{ bindep_command }}"
|
||||
when: bindep_command is defined
|
||||
register: bindep_command_stat
|
||||
- include: find.yaml
|
||||
when: bindep_file is not defined
|
||||
|
||||
- name: Check for system bindep
|
||||
args:
|
||||
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: find-bindep.yaml
|
||||
when: bindep_file is defined
|
||||
|
||||
- include: install.yaml
|
||||
when: bindep_command is not defined
|
||||
|
||||
- include: find.yaml
|
||||
when: bindep_file is not defined
|
||||
|
||||
- name: Define bindep_command fact
|
||||
set_fact:
|
||||
bindep_run: "{{ bindep_command }} -b -f {{ bindep_file }} {{ bindep_profile }}"
|
||||
|
Loading…
Reference in New Issue
Block a user