From 5de113d92b8ed019100f9ebee7e1de0f77533f8f Mon Sep 17 00:00:00 2001 From: N Date: Tue, 17 Sep 2019 23:41:14 +0100 Subject: [PATCH] fix(saltbug): fix for strange 'unless: ' bug --- iscsi/initiator/make/install.sls | 4 +++- iscsi/target/make/install.sls | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/iscsi/initiator/make/install.sls b/iscsi/initiator/make/install.sls index 2adf48fe..f82958bd 100644 --- a/iscsi/initiator/make/install.sls +++ b/iscsi/initiator/make/install.sls @@ -22,7 +22,7 @@ iscsi-initiator-make-file-directory: iscsi-initiator-make-{{ pkg }}-git-latest: git.latest: - - onlyif: {{ iscsi.initiator.make.gitrepo }} + - onlyif: {{ iscsi.initiator.make.gitrepo != None }} - name: {{ iscsi.initiator.make.gitrepo }}/{{ pkg }}.git - initiator: /home/{{ iscsi.user }}/{{ pkg }} - user: {{ iscsi.user }} @@ -45,6 +45,8 @@ iscsi-initiator-make-{{ pkg }}-cmd-run: - cwd: /home/{{ iscsi.user }}/{{ pkg }} - name: {{ iscsi.initiator.make.cmd }} - runas: {{ iscsi.user }} + - onchanges: + - git: iscsi-initiator-make-{{ pkg }}-git-latest - require: - git: iscsi-initiator-make-{{ pkg }}-git-latest - require_in: diff --git a/iscsi/target/make/install.sls b/iscsi/target/make/install.sls index 87057c92..d3ff87da 100644 --- a/iscsi/target/make/install.sls +++ b/iscsi/target/make/install.sls @@ -22,7 +22,7 @@ iscsi-target-make-file-directory: iscsi-target-make-{{ pkg }}-git-latest: git.latest: - - onlyif: {{ iscsi.target.make.gitrepo }} + - onlyif: {{ iscsi.target.make.gitrepo != None }} - name: {{ iscsi.target.make.gitrepo }}/{{ pkg }}.git - target: /home/{{ iscsi.user }}/{{ pkg }} - user: {{ iscsi.user }} @@ -45,6 +45,8 @@ iscsi-target-make-{{ pkg }}-cmd-run: - cwd: /home/{{ iscsi.user }}/{{ pkg }} - name: {{ iscsi.target.make.cmd }} - runas: {{ iscsi.user }} + - onchanges: + - git: iscsi-target-make-{{ pkg }}-git-latest - require: - git: iscsi-target-make-{{ pkg }}-git-latest - require_in: