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 4F8431381F3 for ; Sat, 12 Oct 2013 14:51:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1099FE0853; Sat, 12 Oct 2013 14:50:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F734E0853 for ; Sat, 12 Oct 2013 14:50:58 +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 AFD5433EF0B for ; Sat, 12 Oct 2013 14:50:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5D14BE5308 for ; Sat, 12 Oct 2013 14:50:56 +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: <1381588689.f751e14416066fa0290c76c1f675d4093bb1d436.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/runscript.c X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: f751e14416066fa0290c76c1f675d4093bb1d436 X-VCS-Branch: master Date: Sat, 12 Oct 2013 14:50:56 +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: 060d6ef5-ff96-4120-b134-8e61fbeeb659 X-Archives-Hash: df9f8820abad581ed33d7960efc93481 commit: f751e14416066fa0290c76c1f675d4093bb1d436 Author: William Hubbs gmail com> AuthorDate: Fri Oct 11 17:55:27 2013 +0000 Commit: William Hubbs gentoo org> CommitDate: Sat Oct 12 14:38:09 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f751e144 convert flock() messages to verbose warnings Convert these messages to warnings that are only displayed if EINFO_VERBOSE is set to yes in the environment. This is based on a suggestion from Patrick Lauer gentoo.org>. X-Gentoo-Bug: 487588 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=487588 --- src/rc/runscript.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/rc/runscript.c b/src/rc/runscript.c index 0eea335..3ecb6b5 100644 --- a/src/rc/runscript.c +++ b/src/rc/runscript.c @@ -313,15 +313,13 @@ write_prefix(const char *buffer, size_t bytes, bool *prefixed) if (lock_fd != -1) { while (flock(lock_fd, LOCK_EX) != 0) { if (errno != EINTR) { - eerror("flock() failed: %s", strerror(errno)); + ewarnv("flock() failed: %s", strerror(errno)); break; } } } -#ifdef RC_DEBUG else - ewarn("Couldn't open the prefix lock, please make sure you have enough permissions"); -#endif + ewarnv("Couldn't open the prefix lock, please make sure you have enough permissions"); for (i = 0; i < bytes; i++) { /* We don't prefix eend calls (cursor up) */