From owner-svn-ports-head@FreeBSD.ORG  Fri Oct 11 02:52:35 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B26AEB2F;
 Fri, 11 Oct 2013 02:52:35 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9EAFD2FA7;
 Fri, 11 Oct 2013 02:52:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9B2qZ5p047935;
 Fri, 11 Oct 2013 02:52:35 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9B2qZNj047934;
 Fri, 11 Oct 2013 02:52:35 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201310110252.r9B2qZNj047934@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 11 Oct 2013 02:52:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330052 - head/Mk/Scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Oct 2013 02:52:35 -0000

Author: bdrewery
Date: Fri Oct 11 02:52:35 2013
New Revision: 330052
URL: http://svnweb.freebsd.org/changeset/ports/330052

Log:
  - Fix desktopfileutils() and sharedmimeinfo() returning non-zero and causing
    failure on every port that does not use shared-mime-info or need it.
  
    Must return 0 at end of functions or it considers the last command ran as
    the return code.
  
  Reported by:	eadler
  With hat:	portmgr

Modified:
  head/Mk/Scripts/qa.sh

Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh	Fri Oct 11 02:50:06 2013	(r330051)
+++ head/Mk/Scripts/qa.sh	Fri Oct 11 02:52:35 2013	(r330052)
@@ -79,6 +79,7 @@ desktopfileutils() {
 		grep -q MimeType= ${STAGEDIR}${PREFIX}/share/applications/*.desktop 2>/dev/null ||
 		warn "you may not need USES=desktop-file-utils"
 	fi
+	return 0
 }
 
 sharedmimeinfo() {
@@ -89,6 +90,7 @@ sharedmimeinfo() {
 		find ${STAGEDIR}${PREFIX}/share/mime/packages/*.xml ! -name "freedesktop\.org\.xml" -quit 2>/dev/null ||
 		warn "you may not need USES=shared-mime-info"
 	fi
+	return 0
 }
 
 checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo"