From owner-svn-src-all@freebsd.org  Thu Aug  6 18:18:08 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 464A09B5921;
 Thu,  6 Aug 2015 18:18:08 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 34B9AFDB;
 Thu,  6 Aug 2015 18:18:08 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t76II8BY060078;
 Thu, 6 Aug 2015 18:18:08 GMT (envelope-from peter@FreeBSD.org)
Received: (from peter@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t76II8IF060077;
 Thu, 6 Aug 2015 18:18:08 GMT (envelope-from peter@FreeBSD.org)
Message-Id: <201508061818.t76II8IF060077@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: peter set sender to
 peter@FreeBSD.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Date: Thu, 6 Aug 2015 18:18:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-svnadmin@freebsd.org
Subject: svn commit: r286376 - svnadmin/hooks/scripts
X-SVN-Group: svnadmin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Aug 2015 18:18:08 -0000

Author: peter
Date: Thu Aug  6 18:18:07 2015
New Revision: 286376
URL: https://svnweb.freebsd.org/changeset/base/286376

Log:
  Catch cases where a log message is canonified all the way down to nothing
  due to an empty template being sent.

Modified:
  svnadmin/hooks/scripts/log-police.py

Modified: svnadmin/hooks/scripts/log-police.py
==============================================================================
--- svnadmin/hooks/scripts/log-police.py	Thu Aug  6 18:15:56 2015	(r286375)
+++ svnadmin/hooks/scripts/log-police.py	Thu Aug  6 18:18:07 2015	(r286376)
@@ -64,8 +64,14 @@ def fix_txn(fs, txn_name):
   log_message = svn.fs.svn_fs_txn_prop(txn, "svn:log")
   if log_message is not None:
     new_message = fix_log_message(log_message)
+    if new_message.strip() == "":
+      sys.stderr.write("Log message required\n")
+      sys.exit(1)
     if new_message != log_message:
       svn.fs.svn_fs_change_txn_prop(txn, "svn:log", new_message)
+  else:
+    sys.stderr.write("Log message required\n")
+    sys.exit(1)
 
 
 def fix_rev(fs, revnum):