From owner-svn-src-user@FreeBSD.ORG  Tue Sep 10 21:09:20 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 EAEA6921;
 Tue, 10 Sep 2013 21:09:20 +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 D80392C0F;
 Tue, 10 Sep 2013 21:09:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8AL9Kp2008056;
 Tue, 10 Sep 2013 21:09:20 GMT
 (envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8AL9KZ3008054;
 Tue, 10 Sep 2013 21:09:20 GMT
 (envelope-from cperciva@svn.freebsd.org)
Message-Id: <201309102109.r8AL9KZ3008054@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Tue, 10 Sep 2013 21:09:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r255458 - 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: Tue, 10 Sep 2013 21:09:21 -0000

Author: cperciva
Date: Tue Sep 10 21:09:20 2013
New Revision: 255458
URL: http://svnweb.freebsd.org/changeset/base/255458

Log:
  Fix my previous commit here: It's the *staging* directory which needs to
  have world-readable files in it, not our private state directory. [1]
  
  While here, don't warn about the directory itself, since we only tar up
  the contents to send out to the mirrors. [2]
  
  Pointy hat to:	cperciva [1]
  Submitted by:	des [2]

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	Tue Sep 10 20:56:01 2013	(r255457)
+++ user/cperciva/freebsd-update-mirror/umirror-package.sh	Tue Sep 10 21:09:20 2013	(r255458)
@@ -25,9 +25,9 @@ else
 fi
 
 # Check that the files we're publishing have publishable permissions
-if find "${PRIVDIR}" \! -perm -444 | grep -q .; then
+if find "${STAGEDIR}" \! -type f -perm -444 | grep -q .; then
 	echo "Files to be published have bad permissions:"
-	find "${PRIVDIR}" \! -perm -444
+	find "${STAGEDIR}" \! -type f -perm -444
 	echo
 	echo "You should fix this before publishing them."
 	exit 1