Date: Wed, 7 Apr 2010 08:22:43 GMT From: Garrett Cooper <gcooper@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 176608 for review Message-ID: <201004070822.o378MhB1006183@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004070822.o378MhB1006183>