From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 069FB139695 for ; Mon, 24 Jul 2017 01:50:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5133FE0D77; Mon, 24 Jul 2017 01:50:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1AA75E0D77 for ; Mon, 24 Jul 2017 01:50:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A16F43416A9 for ; Mon, 24 Jul 2017 01:50:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D872974B8 for ; Mon, 24 Jul 2017 01:50:03 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1500860950.3341669a9bc005accafbdecfe973e5630547c869.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/puppet/puppet-3.8.7-r1.ebuild app-admin/puppet/puppet-4.10.1.ebuild app-admin/puppet/puppet-4.10.4.ebuild app-admin/puppet/puppet-4.8.1.ebuild app-admin/puppet/puppet-4.9.1-r2.ebuild app-admin/puppet/puppet-5.0.0.ebuild X-VCS-Directories: app-admin/puppet/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 3341669a9bc005accafbdecfe973e5630547c869 X-VCS-Branch: master Date: Mon, 24 Jul 2017 01:50:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d435ce10-3eb8-48cb-bf7b-a2508c647d34 X-Archives-Hash: 37de9a6d7233800c6aaec5ba7c252a81 commit: 3341669a9bc005accafbdecfe973e5630547c869 Author: Matthew Thode gentoo org> AuthorDate: Mon Jul 24 01:49:10 2017 +0000 Commit: Matt Thode gentoo 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 }