commit: 3341669a9bc005accafbdecfe973e5630547c869
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 01:49:10 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 01:49:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3341669a
app-admin/puppet: fix REPLACING_VERSIONS use
Package-Manager: Portage-2.3.6, Repoman-2.3.3
app-admin/puppet/puppet-3.8.7-r1.ebuild | 15 +++++++++------
app-admin/puppet/puppet-4.10.1.ebuild | 23 +++++++++++++----------
app-admin/puppet/puppet-4.10.4.ebuild | 23 +++++++++++++----------
app-admin/puppet/puppet-4.8.1.ebuild | 23 +++++++++++++----------
app-admin/puppet/puppet-4.9.1-r2.ebuild | 23 +++++++++++++----------
app-admin/puppet/puppet-5.0.0.ebuild | 18 ++++++++----------
6 files changed, 69 insertions(+), 56 deletions(-)
diff --git a/app-admin/puppet/puppet-3.8.7-r1.ebuild
b/app-admin/puppet/puppet-3.8.7-r1.ebuild
index abc9fe39e98..f7e608e5bbf 100644
--- 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 4f580f69e6f..77b1ce4bfcd 100644
--- 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 7ec0d6d305d..9709758f904 100644
--- 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 402399c195c..37be9f4b017 100644
--- 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 a2182bbccb5..4cdd7b6f5c3 100644
--- 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 5d316d4ad94..20a7d9bce62 100644
--- 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
}
