X-Original-To: alpine-devel@mail.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 5A58ADC085F for ; Tue, 18 Aug 2015 20:01:09 +0000 (UTC) Received: from lithium.8pit.net (lithium.8pit.net [141.101.32.65]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id A53B6DC01FD; Tue, 18 Aug 2015 20:01:07 +0000 (UTC) Received: from localhost (ip5f5ac946.dynamic.kabel-deutschland.de [95.90.201.70]); by lithium.8pit.net (OpenSMTPD) with ESMTPSA id d10123ff; TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Tue, 18 Aug 2015 22:01:03 +0200 (CEST) From: =?UTF-8?q?S=C3=B6ren=20Tempel?= To: alpine-devel@lists.alpinelinux.org Subject: [alpine-devel] [PATCH] abuild: check for man pages in non-standard locations Date: Tue, 18 Aug 2015 22:00:59 +0200 Message-Id: <1439928059-5204-1-git-send-email-soeren+git@soeren-tempel.net> X-Mailer: git-send-email 2.5.0 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Some packages like fakeroot install man pages to /usr/share/man/{de,fr,pl,...}. In my opinion we don't need those man pages and thus I would suggest that only /usr/share/man[0-8] should exist. This also allows us to simply our check for non-compressed man pages. --- abuild.in | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/abuild.in b/abuild.in index 6d393c8..da83ca1 100644 --- a/abuild.in +++ b/abuild.in @@ -655,13 +655,20 @@ postcheck() { if ! is_doc_pkg "$name"; then warning "Found /usr/share/man but package name doesn't end with -doc" fi - # check for uncompressed man pages - i=$(find "$dir"/usr/share/man -name '*.[0-9]' -type f | sed "s|^$dir|\t|") + # check for man pages in non-standard locations + i=$(find "$dir"/usr/share/man -maxdepth 1 \! \( -name man[0-8] -a -type d \) -a \! -path "$dir"/usr/share/man | sed "s|^$dir|\t|") if [ -n "$i" ]; then - error "Found uncompressed man pages:" - echo "$i" + error "Found non-standard man page sections:" + echo $i return 1 fi + # check for uncompressed man pages + for i in "$dir"/usr/share/man/man[0-8]/*.[0-8]; do + if [ -e "$i" ]; then + error "Found uncompressed man pages: ${i#$dir/}" + return 1 + fi + done fi # check directory permissions i=$(find "$dir" -type d -perm -777 | sed "s|^$dir|\t|") -- 2.5.0 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---