vanagon 0.15.5 → 0.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b06ca82e8ea507978ae5b63080c4086e313b0579
-  data.tar.gz: b64b0c224ab8fc0c6f136f89618b3405522cb1db
+  metadata.gz: e5a83822020767811cd2c7b42d16b094752b1c9f
+  data.tar.gz: ec3e49e59648f42c731ad2a0e96d0ee954b23816
 SHA512:
-  metadata.gz: 076c47ed17a8b1205421c67813159f010d27a0d9176f9dd83782d3f9dcf5940ea35615e6e142a61c191d0fd145fac1690c483dd24eb3a3acf50c09e4443e26ec
-  data.tar.gz: 58ba84fd5e7a3a4caadae42e85843ed24b32e6d4ea1e97f95adc6cb9363eeef52b773a40b39ae1887526de2ce5eedd1e53c06fbb8c8d16ab10f9f35652b11220
+  metadata.gz: 62f44cecb7fa71043ac71cde7f64fb5b8b1c74fed0f05392e9b9b683762c73c7af7afae99d46c15622eac31259a8bacf1b03686eacbeff65ff2ae4e274025ebc
+  data.tar.gz: 588443a7cbc72940736c2964b15e8da0dc61d90c23e7a009dd8ac1ca0c5a2a6c6f75e8228436a6e7ae9985943b4a6657f773d3a6fd537828c41af39c7f12ed4f

data/resources/rpm/project.spec.erb

@@ -194,6 +194,14 @@ if [ "$1" -gt 1 ] ; then
   <%= get_preinstall_actions("upgrade") %>
 fi
 
+<%- if @platform.is_aix? -%>
+    <%- get_services.each do |service| -%>
+        # Stop service on upgrade so that it can be restarted at the end
+        if [ "$1" -gt 1 ] ; then
+            /usr/bin/stopsrc -s <%= service.name -%> > /dev/null 2>&1 || :
+        fi
+    <%- end -%>
+<%- end -%>
 
 <%- get_all_trigger_pkgs.each do |pkg| %>
 
@@ -218,11 +226,6 @@ fi
 if [ "$1" -eq 1 ] ; then
   <%= get_postinstall_actions("install") %>
 fi
-
-# Run postinstall scripts on upgrade if defined
-if [ "$1" -eq 2 ] ; then
-  <%= get_postinstall_actions("upgrade") %>
-fi
 <%- end -%>
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv vs smf vs aix
@@ -248,6 +251,19 @@ fi
   <%- end -%>
 <%- end -%>
 
+%triggerpostun -- <%= @name %>
+<%- if @platform.is_aix? || (@platform.is_el? && @platform.os_version.to_i == 4) -%>
+  # old versions of vanagon generated an unconditional service stop in
+  # the preun. This means that postinstall actions that mess with the
+  # service need to be run AFTER that step. To do so, we can run them
+  # in the "triggerpostun" when an upgrade is happening.
+
+  # Run postinstall scripts on upgrade if defined
+  if [ "$2" -gt 0 ] ; then
+    <%= get_postinstall_actions("upgrade") %>
+  fi
+<%- end -%>
+
 
 %postun
 # Run post-uninstall scripts on upgrade if defined
@@ -306,7 +322,10 @@ fi
       chkconfig --del <%= service.name %> || :
     fi
   <%- elsif @platform.servicetype == "aix" -%>
-      /usr/bin/stopsrc -s <%= service.name -%> > /dev/null 2>&1 || :
+      # stop the service only on a real uninstall, not on upgrades
+      if [ "$1" -eq 0 ] ; then
+          /usr/bin/stopsrc -s <%= service.name -%> > /dev/null 2>&1 || :
+      fi
   <%- end -%>
 <%- end -%>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.15.6
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git