From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CBD34138247 for ; Sat, 11 Oct 2014 19:47:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6375AE0B7B; Sat, 11 Oct 2014 19:47:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0E519E0B7B for ; Sat, 11 Oct 2014 19:47:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CC2633BDE9 for ; Sat, 11 Oct 2014 19:47:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8ADA8795A for ; Sat, 11 Oct 2014 19:47:32 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1413056837.3a97f7c0dd702d55e1280c1153d44ee8747fe1f4.robbat2@OpenRC> Subject: [gentoo-commits] proj/netifrc:master commit in: init.d/ X-VCS-Repository: proj/netifrc X-VCS-Files: init.d/net.lo.in X-VCS-Directories: init.d/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 3a97f7c0dd702d55e1280c1153d44ee8747fe1f4 X-VCS-Branch: master Date: Sat, 11 Oct 2014 19:47:32 +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: bd6982ed-1c5f-4574-8402-812b3f8bc147 X-Archives-Hash: 60fcbcc1fdb845b8b71031f46c0d562a commit: 3a97f7c0dd702d55e1280c1153d44ee8747fe1f4 Author: mirabilos debian org> AuthorDate: Fri Oct 10 21:58:11 2014 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Oct 11 19:47:17 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=3a97f7c0 Fix https://bugs.gentoo.org/show_bug.cgi?id=500942 “unset x” also removes the “local x” property, so the next assignment and/or read to/from $x will access the global variable “x”. Signed-off-by: Robin H. Johnson gentoo.org> --- init.d/net.lo.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.d/net.lo.in b/init.d/net.lo.in index 01c1b20..6a0aefb 100644 --- a/init.d/net.lo.in +++ b/init.d/net.lo.in @@ -203,7 +203,7 @@ _program_available() /*) [ -x "${x}" ] && break;; *) type "${x}" >/dev/null 2>&1 && break;; esac - unset x + x= done [ -n "${x}" ] && echo $x && return 0 return 1