[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

[Zac Medico]

commit:     bbc7b4b290bbbd1c3a67c101819b8b95ff959002
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 01:01:19 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 01:06:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc7b4b2

sys-apps/portage: make sync-depth message conditional

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/portage/portage-2.3.3.ebuild | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/sys-apps/portage/portage-2.3.3.ebuild 
b/sys-apps/portage/portage-2.3.3.ebuild
index 20e8d629cd..cb5403e124 100644
--- a/sys-apps/portage/portage-2.3.3.ebuild
+++ b/sys-apps/portage/portage-2.3.3.ebuild
@@ -237,6 +237,12 @@ pkg_preinst() {
                USERSYNC_UPGRADE=false
                REPOS_CONF_UPGRADE=false
        fi
+       if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
+               has_version "<${CATEGORY}/${PN}-2.3.3"; then
+               SYNC_DEPTH_UPGRADE=true
+       else
+               SYNC_DEPTH_UPGRADE=false
+       fi
 }
 
 get_ownership() {
@@ -357,9 +363,11 @@ pkg_postinst() {
                fi
        fi
 
-       ewarn "Please note that this release no longer respects sync-depth for"
-       ewarn "git repositories.  There have been too many problems and"
-       ewarn "performance issues.  See bugs 552814, 559008"
+       if ${SYNC_DEPTH_UPGRADE}; then
+               ewarn "Please note that this release no longer respects 
sync-depth for"
+               ewarn "git repositories.  There have been too many problems and"
+               ewarn "performance issues.  See bugs 552814, 559008"
+       fi
        einfo ""
        einfo "This release of portage NO LONGER contains the repoman code 
base."
        einfo "Repoman has its own ebuild and release package."