From owner-p4-projects@FreeBSD.ORG  Mon Jun  8 04:39:31 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8A2F81065670; Mon,  8 Jun 2009 04:39:30 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A488106566B
	for <perforce@FreeBSD.org>; Mon,  8 Jun 2009 04:39:30 +0000 (UTC)
	(envelope-from dforsyth@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DA068FC08
	for <perforce@FreeBSD.org>; Mon,  8 Jun 2009 04:39:30 +0000 (UTC)
	(envelope-from dforsyth@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n584dUKC058079
	for <perforce@FreeBSD.org>; Mon, 8 Jun 2009 04:39:30 GMT
	(envelope-from dforsyth@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n584dTrY058077
	for perforce@freebsd.org; Mon, 8 Jun 2009 04:39:29 GMT
	(envelope-from dforsyth@FreeBSD.org)
Date: Mon, 8 Jun 2009 04:39:29 GMT
Message-Id: <200906080439.n584dTrY058077@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	dforsyth@FreeBSD.org using -f
From: David Forsythe <dforsyth@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 163758 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 04:39:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=163758

Change 163758 by dforsyth@squirrel on 2009/06/08 04:38:46

	Don't die when a package database contains non-directories.

Affected files ...

.. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#11 edit

Differences ...

==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#11 (text+ko) ====

@@ -91,9 +91,12 @@
 	for (i = 0; i < pkg_count; ++i) {
 		p = pkgdb_read_pkg_hierdb(db, ents[i]->d_name);
 		if (p == NULL) {
+			/*
 			pkgdb_free_pkg_list(db);
 			free(ents);
 			return (-1);
+			*/
+			continue;
 		}
 		pkgdb_pkg_list_append(db, p);
 		free(ents[i]);