Date: Fri, 11 Oct 2013 02:52:35 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330052 - head/Mk/Scripts Message-ID: <201310110252.r9B2qZNj047934@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310110252.r9B2qZNj047934>