fix(saltbug): fix for strange 'unless: <url>' bug

saltstack-formulas · Oct 4, 2019 · 5de113d · 5de113d
1 parent 8d9d959
commit 5de113d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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: