From owner-svn-src-user@FreeBSD.ORG  Sun Sep  8 21:10:49 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@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 ESMTP id 07EA47AB;
 Sun,  8 Sep 2013 21:10:49 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
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 E8A4821A8;
 Sun,  8 Sep 2013 21:10:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r88LAmJZ065907;
 Sun, 8 Sep 2013 21:10:48 GMT (envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r88LAmef065906;
 Sun, 8 Sep 2013 21:10:48 GMT (envelope-from cperciva@svn.freebsd.org)
Message-Id: <201309082110.r88LAmef065906@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Sun, 8 Sep 2013 21:10:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r255408 - user/cperciva/freebsd-update-mirror
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 08 Sep 2013 21:10:49 -0000

Author: cperciva
Date: Sun Sep  8 21:10:48 2013
New Revision: 255408
URL: http://svnweb.freebsd.org/changeset/base/255408

Log:
  Refuse to create a new package of bits with the same name as an old package.
  The mirroring code keeps track of which packages it has downloaded already,
  so this would result in bits never reaching the mirrors.
  
  Submitted by:	delphij

Modified:
  user/cperciva/freebsd-update-mirror/umirror-package.sh

Modified: user/cperciva/freebsd-update-mirror/umirror-package.sh
==============================================================================
--- user/cperciva/freebsd-update-mirror/umirror-package.sh	Sun Sep  8 21:07:41 2013	(r255407)
+++ user/cperciva/freebsd-update-mirror/umirror-package.sh	Sun Sep  8 21:10:48 2013	(r255408)
@@ -15,6 +15,13 @@ fi
 # Set an ID if we don't have one already
 if [ -z "${ID}" ]; then
 	ID=`date "+%s"`
+else
+	while read EID X Y; do
+		if [ "${EID}" = "${ID}" ]; then
+			echo "Error: ${ID} already exists, this may be not what you want."
+			exit 1
+		fi
+	done < "${PRIVDIR}/flist"
 fi
 
 # Check that the files we're publishing have publishable permissions