From owner-p4-projects@FreeBSD.ORG  Thu May 27 11:15:09 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 225801065673; Thu, 27 May 2010 11:15:09 +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 DAEBA106564A
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 11:15:08 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C86A88FC1A
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 11:15:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4RBF8gn029857
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 11:15:08 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4RBF8mi029855
	for perforce@freebsd.org; Thu, 27 May 2010 11:15:08 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 27 May 2010 11:15:08 GMT
Message-Id: <201005271115.o4RBF8mi029855@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178874 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 27 May 2010 11:15:09 -0000

http://p4web.freebsd.org/@@178874?ac=10

Change 178874 by gcooper@gcooper-bayonetta on 2010/05/27 11:15:08

	Fix inverted logic with the file descriptor value.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#17 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#17 (text+ko) ====

@@ -428,7 +428,7 @@
 	}
 
 	/* The initial open failed or archive(3) failed to open the file. */
-	if (archive_fd != -1 || archive == NULL) ;
+	if (archive_fd == -1 || archive == NULL) ;
 	/* archive(3) failed to open the file descriptor. */
 	else if (archive_read_open_fd(archive, archive_fd,
 	    ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK)
@@ -515,7 +515,7 @@
 	}
 
 	/* The initial open failed or archive(3) failed to open the file. */
-	if (archive_fd != -1 || archive == NULL) ;
+	if (archive_fd == -1 || archive == NULL) ;
 	/* archive(3) failed to open the file descriptor. */
 	else if (archive_read_open_fd(archive, archive_fd,
 	    ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK)