From owner-svn-ports-branches@FreeBSD.ORG Tue Oct 7 06:54:50 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CEE38591; Tue, 7 Oct 2014 06:54:50 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A096BECB; Tue, 7 Oct 2014 06:54:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s976so87094567; Tue, 7 Oct 2014 06:54:50 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s976sogn094565; Tue, 7 Oct 2014 06:54:50 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201410070654.s976sogn094565@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 7 Oct 2014 06:54:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370274 - in branches/2014Q4/ports-mgmt/pkg: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Oct 2014 06:54:50 -0000 Author: bapt Date: Tue Oct 7 06:54:49 2014 New Revision: 370274 URL: https://svnweb.freebsd.org/changeset/ports/370274 QAT: https://qat.redports.org/buildarchive/r370274/ Log: MFH: r370273 Fix a regression that made some plist errors non fatal Reported by: antoine Added: branches/2014Q4/ports-mgmt/pkg/files/patch-plist-non-fatal - copied unchanged from r370273, head/ports-mgmt/pkg/files/patch-plist-non-fatal Modified: branches/2014Q4/ports-mgmt/pkg/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/ports-mgmt/pkg/Makefile ============================================================================== --- branches/2014Q4/ports-mgmt/pkg/Makefile Tue Oct 7 06:53:49 2014 (r370273) +++ branches/2014Q4/ports-mgmt/pkg/Makefile Tue Oct 7 06:54:49 2014 (r370274) @@ -2,7 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.3.8 -PORTREVISION= 2 +PORTREVISION= 3 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ Copied: branches/2014Q4/ports-mgmt/pkg/files/patch-plist-non-fatal (from r370273, head/ports-mgmt/pkg/files/patch-plist-non-fatal) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/ports-mgmt/pkg/files/patch-plist-non-fatal Tue Oct 7 06:54:49 2014 (r370274, copy of r370273, head/ports-mgmt/pkg/files/patch-plist-non-fatal) @@ -0,0 +1,31 @@ +diff --git libpkg/pkg_ports.c libpkg/pkg_ports.c +index 33a29d0..21182b4 100644 +--- libpkg/pkg_ports.c ++++ libpkg/pkg_ports.c +@@ -1141,7 +1141,7 @@ int + ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage) + { + char *line = NULL; +- int ret = EPKG_OK; ++ int ret, rc = EPKG_OK; + struct plist *pplist; + FILE *plist_f; + size_t linecap = 0; +@@ -1162,6 +1162,8 @@ ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage) + if (line[linelen - 1] == '\n') + line[linelen - 1] = '\0'; + ret = plist_parse_line(pkg, pplist, line); ++ if (rc == EPKG_OK) ++ rc = ret; + } + + free(line); +@@ -1185,7 +1187,7 @@ ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage) + + plist_free(pplist); + +- return (ret); ++ return (rc); + } + + int