From owner-svn-doc-svnadmin@freebsd.org Fri Oct 23 03:35:28 2015 Return-Path: Delivered-To: svn-doc-svnadmin@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 4D7F3A1B97D; Fri, 23 Oct 2015 03:35:28 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 0ECA11593; Fri, 23 Oct 2015 03:35:27 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9N3ZRkr086594; Fri, 23 Oct 2015 03:35:27 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9N3ZRLS086592; Fri, 23 Oct 2015 03:35:27 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201510230335.t9N3ZRLS086592@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Fri, 23 Oct 2015 03:35:27 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-svnadmin@freebsd.org Subject: svn commit: r47643 - in svnadmin/hooks: . scripts X-SVN-Group: doc-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-svnadmin@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for svnadmin of the doc trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2015 03:35:28 -0000 Author: hrs Date: Fri Oct 23 03:35:26 2015 New Revision: 47643 URL: https://svnweb.freebsd.org/changeset/doc/47643 Log: Add text/troff to the list of allowed binary files. Approved by: doceng (implicit) Modified: svnadmin/hooks/pre-commit svnadmin/hooks/scripts/verify.py Modified: svnadmin/hooks/pre-commit ============================================================================== --- svnadmin/hooks/pre-commit Thu Oct 22 21:23:02 2015 (r47642) +++ svnadmin/hooks/pre-commit Fri Oct 23 03:35:26 2015 (r47643) @@ -78,7 +78,8 @@ sizelimit.py "$REPO" "$TXN" 1024000 || e # POLICY: mime-type must be unset, text/*, application/* or image/* # POLICY: if a file does has fbsd:nokeywords, then svn:keywords must not be set # POLICY: if a file has binary chars and no fbsd:notbinary, then pretend its not binary -# POLICY: if a file is binary, then it must have mime application/* or image/* +# POLICY: if a file is binary, then it must have mime application/*, image/*, +# or text/{sgml,xml,troff}. # POLICY: if a file does not have fbsd:nokeywords, or is binary then svn:keywords must be set # POLICY: if svn:keywords is set, $ FreeBSD $ must be present and condensed. # POLICY: If a file has text/*, then it must have eol-style Modified: svnadmin/hooks/scripts/verify.py ============================================================================== --- svnadmin/hooks/scripts/verify.py Thu Oct 22 21:23:02 2015 (r47642) +++ svnadmin/hooks/scripts/verify.py Fri Oct 23 03:35:26 2015 (r47643) @@ -13,7 +13,8 @@ from svn import core, fs, delta, repos # POLICY: mime-type must be unset, text/*, application/* or image/* # POLICY: if a file does has fbsd:nokeywords, then svn:keywords must not be set # POLICY: if a file has binary chars and no fbsd:notbinary, then pretend its not binary -# POLICY: if a file is binary, then it must have mime application/* or image/* +# POLICY: if a file is binary, then it must have mime application/*, image/*, +# or text/{sgml,xml,troff}. # POLICY: if a file does not have fbsd:nokeywords, or is binary then svn:keywords must be set # POLICY: if svn:keywords is set, $ FreeBSD $ must be present and condensed. @@ -186,7 +187,7 @@ class ChangeReceiver(delta.Editor): # POLICY: if a file is binary, then it must have mime application/* or image/* if binary: - if not mimetype.startswith('application/') and not mimetype.startswith('image/') and not mimetype.startswith('text/sgml') and not mimetype.startswith('text/html') and not mimetype.startswith('text/xml'): + if not mimetype.startswith('application/') and not mimetype.startswith('image/') and not mimetype.startswith('text/sgml') and not mimetype.startswith('text/html') and not mimetype.startswith('text/xml') and not mimetype.startswith('text/troff'): self.do_fail('Path "%s" contains binary but has svn:mime-type "%s"\n' % (path, mimetype)) sys.stderr.write('Try application/* (application/octet-stream) or image/* instead.\n')