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 419D11391ED for ; Sat, 8 Mar 2014 05:51:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD53EE0B0A; Sat, 8 Mar 2014 05:51:20 +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 068A5E0AFD for ; Sat, 8 Mar 2014 05:51:19 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D74C33FBA3 for ; Sat, 8 Mar 2014 05:51:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B68A7188F6 for ; Sat, 8 Mar 2014 05:51:16 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1392706337.dc0bc1307ad2e8dd550b0a68f3de1d3574be6008.vapier@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/ X-VCS-Repository: proj/portage-utils X-VCS-Files: libq/xsystem.c X-VCS-Directories: libq/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: dc0bc1307ad2e8dd550b0a68f3de1d3574be6008 X-VCS-Branch: master Date: Sat, 8 Mar 2014 05:51: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: 2aa11a90-db03-415d-b5d4-d70f358bd370 X-Archives-Hash: 9ac17d308dcd7ff23b06dc66eb3c2b04 commit: dc0bc1307ad2e8dd550b0a68f3de1d3574be6008 Author: Mike Frysinger gentoo org> AuthorDate: Tue Feb 18 06:52:17 2014 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Feb 18 06:52:17 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage-utils.git;a=commit;h=dc0bc130 xsystem: do not dump when the func exits normally as the package itself wants to fail, not the qmerge process --- libq/xsystem.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libq/xsystem.c b/libq/xsystem.c index 805eb3f..969d76a 100644 --- a/libq/xsystem.c +++ b/libq/xsystem.c @@ -3,7 +3,7 @@ * * Copyright 2005-2010 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/xsystem.c,v 1.2 2011/02/21 22:02:59 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/xsystem.c,v 1.3 2014/02/18 06:52:17 vapier Exp $ */ #include @@ -28,8 +28,12 @@ static void xsystembash(const char *command) default: /* parent */ waitpid(p, &status, 0); - if (WIFEXITED(status) && WEXITSTATUS(status) == 0) - return; + if (WIFEXITED(status)) { + if (WEXITSTATUS(status) == 0) + return; + else + exit(WEXITSTATUS(status)); + } /* fall through */ case -1: /* fucked */