From owner-p4-projects@FreeBSD.ORG  Mon Jul 19 00:09:35 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D88E3106568E; Mon, 19 Jul 2010 00:09:34 +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 847F81065696
	for <perforce@FreeBSD.org>; Mon, 19 Jul 2010 00:09:34 +0000 (UTC)
	(envelope-from ivoras@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 72E508FC0C
	for <perforce@FreeBSD.org>; Mon, 19 Jul 2010 00:09:34 +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 o6J09YDM036074
	for <perforce@FreeBSD.org>; Mon, 19 Jul 2010 00:09:34 GMT
	(envelope-from ivoras@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6J09YYE036072
	for perforce@freebsd.org; Mon, 19 Jul 2010 00:09:34 GMT
	(envelope-from ivoras@FreeBSD.org)
Date: Mon, 19 Jul 2010 00:09:34 GMT
Message-Id: <201007190009.o6J09YYE036072@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ivoras@FreeBSD.org using -f
From: Ivan Voras <ivoras@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181157 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: Mon, 19 Jul 2010 00:09:35 -0000

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

Change 181157 by ivoras@betelgeuse on 2010/07/19 00:08:57

	Nope, it can be 0.

Affected files ...

.. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#29 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#19 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#19 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#28 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#28 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/main.c#29 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#27 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#27 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.c#12 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.h#11 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#27 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/support.c#26 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/updateweb.c#7 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/updateweb.h#7 edit

Differences ...

==== //depot/projects/soc2010/pkg_patch/src/patch/Makefile#29 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#19 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#19 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#28 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#28 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/main.c#29 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#27 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#27 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.c#12 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.h#11 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#27 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/support.c#26 (text+ko) ====

@@ -688,7 +688,11 @@
 }
 
 
-/* Check for conflicts from metadata in the new package to recorded packages */
+/*
+ * Check for conflicts from metadata in the new package to recorded packages.
+ * Returns (i+1) if the given package pnew conflicts on the i'th element
+ * in pkglist.
+ */
 int
 check_conflicts(Package *pnew, char **pkglist)
 {
@@ -709,7 +713,7 @@
 			for (i = 0; pkglist[i] != NULL; i++) {
 				if (strncmp(pl->name, pkglist[i], PKGNAME_MAX)
 				    == 0)
-					return (i); /* It's ok, cannot be 0 */
+					return (i+1);
 			}
 		}
 		pl = pl->next;

==== //depot/projects/soc2010/pkg_patch/src/patch/updateweb.c#7 (text+ko) ====

@@ -288,7 +288,7 @@
 				err(1, "Error processing package conflicts");
 			else if (er > 0)
 				errx(1, "Package %s conflicts with %s",
-				    pr->source, instpkg[er]);
+				    pr->source, instpkg[er-1]);
 		}
 	}
 	

==== //depot/projects/soc2010/pkg_patch/src/patch/updateweb.h#7 (text+ko) ====