svn commit: r370274 - in branches/2014Q4/ports-mgmt/pkg: . files

[Baptiste Daroussin]

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