From: Sven Eden <yamakuzure@gmx.net>
Date: Wed, 24 May 2017 07:29:35 +0000 (+0200)
Subject: sci-misc/boinc: Fix suspend/resume commands in the init script.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2563ac2933be85a58e7bc953e1f80ac0b04f173b;p=gentoo.git

sci-misc/boinc: Fix suspend/resume commands in the init script.

Both suspend and resume do not work any more, at least with boinc-7.6.33.
The reason is, that fetching the project URLs require password authentication.

This commit adds the required steps to no longer get an authentication error
when trying to suspend/resume boinc.

Closes: https://github.com/gentoo/gentoo/pull/4732
Package-Manager: portage-2.3.6
---

diff --git a/sci-misc/boinc/boinc-7.2.44-r3.ebuild b/sci-misc/boinc/boinc-7.2.44-r4.ebuild
similarity index 100%
rename from sci-misc/boinc/boinc-7.2.44-r3.ebuild
rename to sci-misc/boinc/boinc-7.2.44-r4.ebuild
diff --git a/sci-misc/boinc/boinc-7.4.52-r3.ebuild b/sci-misc/boinc/boinc-7.4.52-r4.ebuild
similarity index 100%
rename from sci-misc/boinc/boinc-7.4.52-r3.ebuild
rename to sci-misc/boinc/boinc-7.4.52-r4.ebuild
diff --git a/sci-misc/boinc/boinc-7.6.33-r3.ebuild b/sci-misc/boinc/boinc-7.6.33-r4.ebuild
similarity index 100%
rename from sci-misc/boinc/boinc-7.6.33-r3.ebuild
rename to sci-misc/boinc/boinc-7.6.33-r4.ebuild
diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index ceeeac87145e..23450a6857cc 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -184,15 +184,17 @@ resume() {
 	env_check || return 1
 
 	local password=""
-	local master_urls=( \
-		$("${BOINCCMD}" --get_project_status | \
-		  sed -n 's/\s*master URL: //p') \
-	)
 
 	if need_passwd_arg; then
 		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
 	fi
 
+	local master_urls=( \
+		$(cd "${RUNTIMEDIR}" ; \
+		  "${BOINCCMD}" ${password} --get_project_status | \
+		  sed -n 's/\s*master URL: //p') \
+	)
+
 	for url in "${master_urls[@]}"; do
 		ebegin "Resuming $url"
 		start-stop-daemon --user "${USER}:${GROUP}" --quiet \
@@ -207,15 +209,17 @@ suspend() {
 	env_check || return 1
 
 	local password=""
-	local master_urls=( \
-		$("${BOINCCMD}" --get_project_status | \
-		  sed -n 's/\s*master URL: //p') \
-	)
 
 	if need_passwd_arg; then
 		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
 	fi
 
+	local master_urls=( \
+		$(cd "${RUNTIMEDIR}" ; \
+		  "${BOINCCMD}" ${password} --get_project_status | \
+		  sed -n 's/\s*master URL: //p') \
+	)
+
 	for url in "${master_urls[@]}"; do
 		ebegin "Suspending $url"
 		start-stop-daemon --user "${USER}:${GROUP}" --quiet \