From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1D615158087 for ; Thu, 27 Jan 2022 20:29:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44CB52BC053; Thu, 27 Jan 2022 20:28:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C4682BC053 for ; Thu, 27 Jan 2022 20:28:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 26799343208 for ; Thu, 27 Jan 2022 20:28:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D08021F0 for ; Thu, 27 Jan 2022 20:28:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1643315307.273d518b5512ecdee5c7e5c215f9230de52c3879.sam@gentoo> Subject: [gentoo-commits] proj/build-docbook-catalog:master commit in: / X-VCS-Repository: proj/build-docbook-catalog X-VCS-Files: build-docbook-catalog X-VCS-Directories: / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 273d518b5512ecdee5c7e5c215f9230de52c3879 X-VCS-Branch: master Date: Thu, 27 Jan 2022 20:28:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 56e32041-451a-43b8-b88d-c23b7392f8fb X-Archives-Hash: bfda10b0388014d1cca692550fe7f2eb commit: 273d518b5512ecdee5c7e5c215f9230de52c3879 Author: Marvin Schmidt exherbo org> AuthorDate: Thu Jan 20 09:06:13 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 27 20:28:27 2022 +0000 URL: https://gitweb.gentoo.org/proj/build-docbook-catalog.git/commit/?id=273d518b Honour ROOT when deleting existing catalog The condition checked for `${ROOT}${ROOTCATALOG}`, but then deleted the catalog file outside of ROOT (`${ROOTCATALOG}`). Fix this by adding the missing `${ROOT}` Signed-off-by: Sam James gentoo.org> build-docbook-catalog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docbook-catalog b/build-docbook-catalog index 1b4ccf3..cee9af0 100755 --- a/build-docbook-catalog +++ b/build-docbook-catalog @@ -173,7 +173,7 @@ create_catalogs() { # Initialize catalogs if they don't exist or are corrupt. if [[ -r ${ROOT}${ROOTCATALOG} ]] && ! xmllint "${ROOT}${ROOTCATALOG}" >&/dev/null ; then - rm -f "${ROOTCATALOG}" + rm -f "${ROOT}${ROOTCATALOG}" echo "Deleting corrupt ${ROOT}${ROOTCATALOG} and starting over" fi if [[ ! -r ${ROOT}${ROOTCATALOG} ]] ; then