From owner-svn-src-stable@FreeBSD.ORG  Thu Nov 28 22:08:42 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7D0F7D55;
 Thu, 28 Nov 2013 22:08:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 67B7917E8;
 Thu, 28 Nov 2013 22:08:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rASM8g9U025280;
 Thu, 28 Nov 2013 22:08:42 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rASM8g2O025279;
 Thu, 28 Nov 2013 22:08:42 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201311282208.rASM8g2O025279@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 28 Nov 2013 22:08:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r258724 - in stable: 8/usr.sbin/freebsd-update
 9/usr.sbin/freebsd-update
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Nov 2013 22:08:42 -0000

Author: delphij
Date: Thu Nov 28 22:08:41 2013
New Revision: 258724
URL: http://svnweb.freebsd.org/changeset/base/258724

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

Modified:
  stable/8/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/8/usr.sbin/freebsd-update/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/9/usr.sbin/freebsd-update/   (props changed)

Modified: stable/8/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/8/usr.sbin/freebsd-update/freebsd-update.sh	Thu Nov 28 22:06:37 2013	(r258723)
+++ stable/8/usr.sbin/freebsd-update/freebsd-update.sh	Thu Nov 28 22:08:41 2013	(r258724)
@@ -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