Date: Thu, 28 Nov 2013 22:12:48 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r258725 - in releng: 8.3 8.3/sys/conf 8.3/usr.sbin/freebsd-update 8.4 8.4/sys/conf 8.4/usr.sbin/freebsd-update 9.1 9.1/sys/conf 9.1/usr.sbin/freebsd-update 9.2 9.2/sys/conf 9.2/usr.sbin... Message-ID: <201311282212.rASMCm57028151@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Thu Nov 28 22:12:48 2013 New Revision: 258725 URL: http://svnweb.freebsd.org/changeset/base/258725 Log: MFC r257879: Fix typo in r256646: We want to generate lists of directories in INDEX-OLD and INDEX-NEW and compare them, not generate the same list of directories from INDEX-OLD twice... Pointy hats to: cperciva & everybody who didn't proofread EN-13:04 enough Errata Notice: FreeBSD-EN-13:05.freebsd-update Approved by: so Modified: releng/8.3/UPDATING releng/8.3/sys/conf/newvers.sh releng/8.3/usr.sbin/freebsd-update/freebsd-update.sh releng/8.4/UPDATING releng/8.4/sys/conf/newvers.sh releng/8.4/usr.sbin/freebsd-update/freebsd-update.sh releng/9.1/UPDATING releng/9.1/sys/conf/newvers.sh releng/9.1/usr.sbin/freebsd-update/freebsd-update.sh releng/9.2/UPDATING releng/9.2/sys/conf/newvers.sh releng/9.2/usr.sbin/freebsd-update/freebsd-update.sh Modified: releng/8.3/UPDATING ============================================================================== --- releng/8.3/UPDATING Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.3/UPDATING Thu Nov 28 22:12:48 2013 (r258725) @@ -15,6 +15,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20131128: p13 FreeBSD-EN-13:05.freebsd-update + Fix error in patch for FreeBSD-EN-13:04.freebsd-update. + 20131026: p12 FreeBSD-EN-13:04.freebsd-update Fix multiple freebsd-update bugs that break upgrading to FreeBSD 10.0. Modified: releng/8.3/sys/conf/newvers.sh ============================================================================== --- releng/8.3/sys/conf/newvers.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.3/sys/conf/newvers.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.3" -BRANCH="RELEASE-p12" +BRANCH="RELEASE-p13" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/8.3/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/8.3/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.3/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -2835,8 +2835,8 @@ again to finish installing updates. install_delete INDEX-OLD INDEX-NEW || return 1 # Remove old directories - grep -vE '^/boot/' $1/INDEX-OLD | - grep -E '^[^|]+\|d\|' > INDEX-OLD + grep -vE '^/boot/' $1/INDEX-NEW | + grep -E '^[^|]+\|d\|' > INDEX-NEW grep -vE '^/boot/' $1/INDEX-OLD | grep -E '^[^|]+\|d\|' > INDEX-OLD install_delete INDEX-OLD INDEX-NEW || return 1 Modified: releng/8.4/UPDATING ============================================================================== --- releng/8.4/UPDATING Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.4/UPDATING Thu Nov 28 22:12:48 2013 (r258725) @@ -15,6 +15,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20131128: p6 FreeBSD-EN-13:05.freebsd-update + Fix error in patch for FreeBSD-EN-13:04.freebsd-update. + 20131026: p5 FreeBSD-EN-13:04.freebsd-update Fix multiple freebsd-update bugs that break upgrading to FreeBSD 10.0. Modified: releng/8.4/sys/conf/newvers.sh ============================================================================== --- releng/8.4/sys/conf/newvers.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.4/sys/conf/newvers.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.4" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/8.4/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/8.4/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/8.4/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -2835,8 +2835,8 @@ again to finish installing updates. install_delete INDEX-OLD INDEX-NEW || return 1 # Remove old directories - grep -vE '^/boot/' $1/INDEX-OLD | - grep -E '^[^|]+\|d\|' > INDEX-OLD + grep -vE '^/boot/' $1/INDEX-NEW | + grep -E '^[^|]+\|d\|' > INDEX-NEW grep -vE '^/boot/' $1/INDEX-OLD | grep -E '^[^|]+\|d\|' > INDEX-OLD install_delete INDEX-OLD INDEX-NEW || return 1 Modified: releng/9.1/UPDATING ============================================================================== --- releng/9.1/UPDATING Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.1/UPDATING Thu Nov 28 22:12:48 2013 (r258725) @@ -9,6 +9,9 @@ handbook. Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20131128: p9 FreeBSD-EN-13:05.freebsd-update + Fix error in patch for FreeBSD-EN-13:04.freebsd-update. + 20131026: p8 FreeBSD-EN-13:04.freebsd-update Fix multiple freebsd-update bugs that break upgrading to FreeBSD 10.0. Modified: releng/9.1/sys/conf/newvers.sh ============================================================================== --- releng/9.1/sys/conf/newvers.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.1/sys/conf/newvers.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.1" -BRANCH="RELEASE-p8" +BRANCH="RELEASE-p9" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/9.1/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/9.1/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.1/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -2884,8 +2884,8 @@ again to finish installing updates. install_delete INDEX-OLD INDEX-NEW || return 1 # Remove old directories - grep -vE '^/boot/' $1/INDEX-OLD | - grep -E '^[^|]+\|d\|' > INDEX-OLD + grep -vE '^/boot/' $1/INDEX-NEW | + grep -E '^[^|]+\|d\|' > INDEX-NEW grep -vE '^/boot/' $1/INDEX-OLD | grep -E '^[^|]+\|d\|' > INDEX-OLD install_delete INDEX-OLD INDEX-NEW || return 1 Modified: releng/9.2/UPDATING ============================================================================== --- releng/9.2/UPDATING Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.2/UPDATING Thu Nov 28 22:12:48 2013 (r258725) @@ -11,6 +11,9 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20131128: p2 FreeBSD-EN-13:05.freebsd-update + Fix error in patch for FreeBSD-EN-13:04.freebsd-update. + 20131026: p1 FreeBSD-EN-13:04.freebsd-update Fix multiple freebsd-update bugs that break upgrading to FreeBSD 10.0. Modified: releng/9.2/sys/conf/newvers.sh ============================================================================== --- releng/9.2/sys/conf/newvers.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.2/sys/conf/newvers.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.2" -BRANCH="RELEASE-p1" +BRANCH="RELEASE-p2" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/9.2/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/9.2/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:08:41 2013 (r258724) +++ releng/9.2/usr.sbin/freebsd-update/freebsd-update.sh Thu Nov 28 22:12:48 2013 (r258725) @@ -2884,8 +2884,8 @@ again to finish installing updates. install_delete INDEX-OLD INDEX-NEW || return 1 # Remove old directories - grep -vE '^/boot/' $1/INDEX-OLD | - grep -E '^[^|]+\|d\|' > INDEX-OLD + grep -vE '^/boot/' $1/INDEX-NEW | + grep -E '^[^|]+\|d\|' > INDEX-NEW grep -vE '^/boot/' $1/INDEX-OLD | grep -E '^[^|]+\|d\|' > INDEX-OLD install_delete INDEX-OLD INDEX-NEW || return 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311282212.rASMCm57028151>