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 AA2C3138200 for ; Mon, 10 Sep 2012 00:18:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 246A2E062B; Mon, 10 Sep 2012 00:17:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E7A73E062C for ; Mon, 10 Sep 2012 00:17:19 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF9F233C84E for ; Mon, 10 Sep 2012 00:17:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id ABCB4E544B for ; Mon, 10 Sep 2012 00:17:16 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1347234280.eb07d1169f2d6bf9f97ea9efd660936dff6453d8.WilliamH@OpenRC> Subject: [gentoo-commits] proj/openrc:openrc-0.10.x commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/mountinfo.c X-VCS-Directories: src/rc/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: eb07d1169f2d6bf9f97ea9efd660936dff6453d8 X-VCS-Branch: openrc-0.10.x Date: Mon, 10 Sep 2012 00:17:16 +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: c54437f9-82c4-4e36-a6fa-3e9adb41ba0e X-Archives-Hash: c7401a744bfa66fa66acfe979e46c280 commit: eb07d1169f2d6bf9f97ea9efd660936dff6453d8 Author: Christian Ruppert gentoo org> AuthorDate: Sat Aug 18 21:21:40 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Sep 9 23:44:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=eb07d116 Fix quiet usage EINFO_QUIET will always been unset when we first do unsetenv("EINFO_QUIET") and later query it again anyway.. --- src/rc/mountinfo.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c index e5d1d3f..eaace13 100644 --- a/src/rc/mountinfo.c +++ b/src/rc/mountinfo.c @@ -393,8 +393,7 @@ mountinfo(int argc, char **argv) bool quiet; char *this_path; - /* Ensure that we are only quiet when explicitly told to be */ - unsetenv("EINFO_QUIET"); + quiet = rc_yesno(getenv("EINFO_QUIET")); #define DO_REG(_var) \ if (_var) free(_var); \ @@ -475,7 +474,6 @@ mountinfo(int argc, char **argv) REG_FREE(args.skip_options_regex); result = EXIT_FAILURE; - quiet = rc_yesno(getenv("EINFO_QUIET")); /* We should report the mounts in reverse order to ease unmounting */ TAILQ_FOREACH_REVERSE(s, nodes, rc_stringlist, entries) {