From owner-svn-src-user@FreeBSD.ORG  Mon Oct 31 09:06:33 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3D13106566B;
	Mon, 31 Oct 2011 09:06:33 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C47078FC13;
	Mon, 31 Oct 2011 09:06:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9V96Xtw007666;
	Mon, 31 Oct 2011 09:06:33 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9V96X2a007664;
	Mon, 31 Oct 2011 09:06:33 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201110310906.p9V96X2a007664@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 31 Oct 2011 09:06:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226962 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Oct 2011 09:06:33 -0000

Author: dougb
Date: Mon Oct 31 09:06:33 2011
New Revision: 226962
URL: http://svn.freebsd.org/changeset/base/226962

Log:
  Unset preserve_port_files when we're done

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Oct 31 08:59:17 2011	(r226961)
+++ user/dougb/portmaster/portmaster	Mon Oct 31 09:06:33 2011	(r226962)
@@ -3763,14 +3763,14 @@ for file in $preserve_port_files; do
 					continue
 				fi ;;
 		esac
-		echo "$left $right" 
+		echo "$left $right"
 	done < $pdb/$new_port/+CONTENTS > $newcon
 	mv $newcon $pdb/$new_port/+CONTENTS
 	unset file oldmd5 newcon left right short_file
 done
 if [ -n "$preserve_dir" ]; then
 	rmdir $preserve_dir 2>/dev/null
-	unset preserve_dir
+	unset preserve_dir preserve_port_files
 fi
 
 echo ''