PERFORCE change 181157 for review

[Ivan Voras]

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

Change 181157 by ivoras at 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) ====