commit:     caea5bc25186343247d5a68dfac73c3a0430ba58
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 17:22:26 2019 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 17:37:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caea5bc2

sys-cluster/torque: fix documentation URLs in postinst message

Closes: https://bugs.gentoo.org/666224
Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 sys-cluster/torque/torque-4.2.10-r1.ebuild |  2 +-
 sys-cluster/torque/torque-6.0.3.ebuild     | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/sys-cluster/torque/torque-4.2.10-r1.ebuild 
b/sys-cluster/torque/torque-4.2.10-r1.ebuild
index 7c06eb30b27..bf8705f64b4 100644
--- a/sys-cluster/torque/torque-4.2.10-r1.ebuild
+++ b/sys-cluster/torque/torque-4.2.10-r1.ebuild
@@ -175,7 +175,7 @@ pkg_postinst() {
                showmessage=0;
                elog "If this is the first time torque has been installed, then 
you are not"
                elog "ready to start the server.  Please refer to the 
documentation located at:"
-               elog 
"http://docs.adaptivecomputing.com/torque/${PN//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm";
+               elog 
"http://docs.adaptivecomputing.com/torque/${PN//./-}/help.htm#topics/1-installConfig/initializeConfigOnServer.htm";
                elog
        else
                for i in ${REPLACING_VERSIONS} ; do

diff --git a/sys-cluster/torque/torque-6.0.3.ebuild 
b/sys-cluster/torque/torque-6.0.3.ebuild
index ec9563e95bf..75508148652 100644
--- a/sys-cluster/torque/torque-6.0.3.ebuild
+++ b/sys-cluster/torque/torque-6.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -165,15 +165,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       elog "    If this is the first time torque has been installed, then you 
are not"
-       elog "ready to start the server.  Please refer to the documentation 
located at:"
-       elog 
"http://docs.adaptivecomputing.com/torque/${PN//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm";
-       if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; 
then
-               echo
-               elog "Important 4.0+ updates"
-               elog "  - The on-wire protocol version has been changed."
-               elog "    Versions of Torque before 4.0.0 are no longer able to 
communicate."
-               elog "  - pbs_iff has been replaced by trqauthd, you will now 
need to add"
-               elog "    trqauthd to your default runlevel."
+        if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+               elog "If this is the first time torque has been installed, then 
you are not"
+               elog "ready to start the server.  Please refer to the 
documentation located at:"
+               elog 
"http://docs.adaptivecomputing.com/torque/${PN//./-}/adminGuide/help.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm";
        fi
 }

Reply via email to