From owner-p4-projects@FreeBSD.ORG  Wed Apr  7 08:22:43 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 921411065675; Wed,  7 Apr 2010 08:22:43 +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 569F31065670
	for <perforce@FreeBSD.org>; Wed,  7 Apr 2010 08:22:43 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 44D018FC13
	for <perforce@FreeBSD.org>; Wed,  7 Apr 2010 08:22:43 +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 o378Mhov006185
	for <perforce@FreeBSD.org>; Wed, 7 Apr 2010 08:22:43 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o378MhB1006183
	for perforce@freebsd.org; Wed, 7 Apr 2010 08:22:43 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Wed, 7 Apr 2010 08:22:43 GMT
Message-Id: <201004070822.o378MhB1006183@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 176608 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: Wed, 07 Apr 2010 08:22:43 -0000

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

Change 176608 by gcooper@gcooper-bayonetta on 2010/04/07 08:22:13

	Remove final remaining merge conflict.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#6 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#6 (text+ko) ====

@@ -56,15 +56,6 @@
     struct utsname u;
 
     if (uname(&u) == -1) {
->>>> ORIGINAL //depot/vendor/freebsd/src/usr.sbin/pkg_install/version/perform.c#14
-==== THEIRS //depot/vendor/freebsd/src/usr.sbin/pkg_install/version/perform.c#15
-	warn("%s(): failed to determine uname information", __func__);
-	return 1;
-    } else if ((rel_major_ver = (int) strtol(u.release, NULL, 10)) <= 0) {
-
-    }
-
-==== YOURS //gcooper-bayonetta/pkg_install-enhancements/usr.sbin/pkg_install/version/perform.c
 	warn("%s.%s: failed to determine uname information", progname,
 	    __func__);
 	return 1;
@@ -74,7 +65,6 @@
 	return 1;
     }
 
-<<<<
     /*
      * Try to find and open the INDEX. We only check IndexFile != NULL
      * later, if we actually need the INDEX.