fix(arch): python-configshell-fb dependency problem

saltstack-formulas · May 8, 2020 · 914c71e · 914c71e
1 parent c0e0e8c
commit 914c71e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/iscsi/initiator/service/install.sls b/iscsi/initiator/service/install.sls
@@ -34,7 +34,6 @@ iscsi-initiator-service-install-service-running:
           {%- else %}
     - name: {{ servicename }}
         {%- endif %}
-    - enable: True
     - enable: False
         {%- else %}
   service.running:

diff --git a/iscsi/osfamilymap.yaml b/iscsi/osfamilymap.yaml
@@ -129,7 +129,7 @@ Arch:
         - binutils
         - fakeroot
         - linux-lts                # For kernel scsi modules
-        - python-pip               # makepkg states needs 'gitpython'.
+        # python-pip               # makepkg states needs 'gitpython'.
         - thin-provisioning-tools
     make:
       gitrepo: https://aur.archlinux.org

diff --git a/iscsi/target/make/install.sls b/iscsi/target/make/install.sls
@@ -42,16 +42,26 @@ iscsi-target-make-{{ pkg }}-git-latest:
     - require:
       - file: iscsi-target-make-file-directory
 
+      {# workaround https://github.com/saltstack-formulas/iscsi-formula/issues/34 #}
+
+      {%- if pkg == 'python-configshell-fb' %}
+             {%- for file in ('.SRCINFO', 'pkg/python2-configshell-fb/.PKGINFO', 'PKGBUILD') %}
+iscsi-target-make-{{ pkg }}-workaround-{{ file }}:
+  file.replace:
+    - name: /home/{{ iscsi.user }}/{{ pkg }}/{{ file }}
+    - onlyif: test -f /home/{{ iscsi.user }}/{{ pkg }}/{{ file }}
+    - pattern: python2-urwid
+    - repl: python-urwid
+    - require_in:
+      - cmd: iscsi-target-make-{{ pkg }}-cmd-run
+             {%- endfor %}
+      {%- endif %}
+
 iscsi-target-make-{{ pkg }}-cmd-run:
-  pkg.installed:
-    - name: python-urwid
-    - onlyif: {{ grains.os_family == 'Arch' }}
   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:

diff --git a/iscsi/target/service/install.sls b/iscsi/target/service/install.sls
@@ -35,7 +35,6 @@ iscsi-target-service-install-service-running:
           {%- else %}
     - name: {{ servicename }}
         {%- endif %}
-    - enable: True
     - enable: False
         {%- else %}
   service.running: