app-admin/puppet: fix REPLACING_VERSIONS use

Package-Manager: Portage-2.3.6, Repoman-2.3.3

diff --git a/app-admin/puppet/puppet-3.8.7-r1.ebuild b/app-admin/puppet/puppet-3.8.7-r1.ebuild
index abc9fe39e9865be87501541459c2a2e2d8d29862..f7e608e5bbfacac2fd02e6e990a587a395bf20b0 100644 (file)
--- a/app-admin/puppet/puppet-3.8.7-r1.ebuild
+++ b/app-admin/puppet/puppet-3.8.7-r1.ebuild
@@ -176,12 +176,15 @@ pkg_postinst() {
                elog
        fi
 
-       if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-               elog
-               elog "If you're upgrading from 2.x then we strongly suggest you to read:"
-               elog "http://docs.puppetlabs.com/guides/upgrading.html"
-               elog
-       fi
+       local v
+       for v in ${REPLACING_VERSIONS}; do
+               if [ "$(get_major_version $v)" = "2" ]; then
+                       elog
+                       elog "If you're upgrading from 2.x then we strongly suggest you to read:"
+                       elog "http://docs.puppetlabs.com/guides/upgrading.html"
+                       elog
+               fi
+       done
 
        use emacs && elisp-site-regen
        use xemacs && xemacs-elisp-site-regen

diff --git a/app-admin/puppet/puppet-4.10.1.ebuild b/app-admin/puppet/puppet-4.10.1.ebuild
index 4f580f69e6f1d86799edd61d30c57b297f78aecb..77b1ce4bfcd723667d7cfd30fdad284908285367 100644 (file)
--- a/app-admin/puppet/puppet-4.10.1.ebuild
+++ b/app-admin/puppet/puppet-4.10.1.ebuild
@@ -160,16 +160,19 @@ pkg_postinst() {
        elog "http://forge.puppetlabs.com/gentoo/portage"
        elog
 
-       if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
-               elog
-               elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-               elog "/etc/puppetlabs/puppet"
-               elog "Also, puppet now uses config directories for modules and manifests."
-               elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-               elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-               elog "for more information."
-               elog
-       fi
+       local v
+       for v in ${REPLACING_VERSIONS}; do
+               if [ "$(get_major_version $v)" = "3" ]; then
+                       elog
+                       elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+                       elog "/etc/puppetlabs/puppet"
+                       elog "Also, puppet now uses config directories for modules and manifests."
+                       elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+                       elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+                       elog "for more information."
+                       elog
+               fi
+       done
 
        use emacs && elisp-site-regen
        use xemacs && xemacs-elisp-site-regen

diff --git a/app-admin/puppet/puppet-4.10.4.ebuild b/app-admin/puppet/puppet-4.10.4.ebuild
index 7ec0d6d305d6659ae647314543b93e824cd93b50..9709758f90474e9adbac3fc09cbb27da61bd16ba 100644 (file)
--- a/app-admin/puppet/puppet-4.10.4.ebuild
+++ b/app-admin/puppet/puppet-4.10.4.ebuild
@@ -170,16 +170,19 @@ pkg_postinst() {
        elog "http://forge.puppetlabs.com/gentoo/portage"
        elog
 
-       if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
-               elog
-               elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-               elog "/etc/puppetlabs/puppet"
-               elog "Also, puppet now uses config directories for modules and manifests."
-               elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-               elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-               elog "for more information."
-               elog
-       fi
+       local v
+       for v in ${REPLACING_VERSIONS}; do
+               if [ "$(get_major_version $v)" = "3" ]; then
+                       elog
+                       elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+                       elog "/etc/puppetlabs/puppet"
+                       elog "Also, puppet now uses config directories for modules and manifests."
+                       elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+                       elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+                       elog "for more information."
+                       elog
+               fi
+       done
 
        use xemacs && xemacs-elisp-site-regen
 }

diff --git a/app-admin/puppet/puppet-4.8.1.ebuild b/app-admin/puppet/puppet-4.8.1.ebuild
index 402399c195c427269f25b22cf03b7e1028378345..37be9f4b017ff49e49d8ec2742bf3779ad8e1894 100644 (file)
--- a/app-admin/puppet/puppet-4.8.1.ebuild
+++ b/app-admin/puppet/puppet-4.8.1.ebuild
@@ -153,16 +153,19 @@ pkg_postinst() {
        elog "http://forge.puppetlabs.com/gentoo/portage"
        elog
 
-       if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
-               elog
-               elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-               elog "/etc/puppetlabs/puppet"
-               elog "Also, puppet now uses config directories for modules and manifests."
-               elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-               elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-               elog "for more information."
-               elog
-       fi
+       local v
+       for v in ${REPLACING_VERSIONS}; do
+               if [ "$(get_major_version $v)" = "3" ]; then
+                       elog
+                       elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+                       elog "/etc/puppetlabs/puppet"
+                       elog "Also, puppet now uses config directories for modules and manifests."
+                       elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+                       elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+                       elog "for more information."
+                       elog
+               fi
+       done
 
        use emacs && elisp-site-regen
        use xemacs && xemacs-elisp-site-regen

diff --git a/app-admin/puppet/puppet-4.9.1-r2.ebuild b/app-admin/puppet/puppet-4.9.1-r2.ebuild
index a2182bbccb5b6a90dbabc71950c3cc304582ce5f..4cdd7b6f5c3ce6640ec23605c1e91eedc73ac419 100644 (file)
--- a/app-admin/puppet/puppet-4.9.1-r2.ebuild
+++ b/app-admin/puppet/puppet-4.9.1-r2.ebuild
@@ -160,16 +160,19 @@ pkg_postinst() {
        elog "http://forge.puppetlabs.com/gentoo/portage"
        elog
 
-       if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
-               elog
-               elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-               elog "/etc/puppetlabs/puppet"
-               elog "Also, puppet now uses config directories for modules and manifests."
-               elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-               elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-               elog "for more information."
-               elog
-       fi
+       local v
+       for v in ${REPLACING_VERSIONS}; do
+               if [ "$(get_major_version $v)" = "3" ]; then
+                       elog
+                       elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+                       elog "/etc/puppetlabs/puppet"
+                       elog "Also, puppet now uses config directories for modules and manifests."
+                       elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+                       elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+                       elog "for more information."
+                       elog
+               fi
+       done
 
        use emacs && elisp-site-regen
        use xemacs && xemacs-elisp-site-regen

diff --git a/app-admin/puppet/puppet-5.0.0.ebuild b/app-admin/puppet/puppet-5.0.0.ebuild
index 5d316d4ad940f1903d24d29d293e703e811da127..20a7d9bce622a97d0305c7dc85dca262219ff0ae 100644 (file)
--- a/app-admin/puppet/puppet-5.0.0.ebuild
+++ b/app-admin/puppet/puppet-5.0.0.ebuild
@@ -133,14 +133,12 @@ pkg_postinst() {
        elog "http://forge.puppetlabs.com/gentoo/portage"
        elog
 
-       if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
-               elog
-               elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-               elog "/etc/puppetlabs/puppet"
-               elog "Also, puppet now uses config directories for modules and manifests."
-               elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-               elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-               elog "for more information."
-               elog
-       fi
+       for v in ${REPLACING_VERSIONS}; do
+               if [ "$(get_major_version $v)" = "4" ]; then
+                       elog
+                       elog "Please see the following url for the release notes for puppet-5"
+                       elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+                       elog
+               fi
+       done
 }