From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/build-docbook-catalog:master commit in: /
Date: Thu, 27 Jan 2022 20:28:43 +0000 (UTC) [thread overview]
Message-ID: <1643315307.273d518b5512ecdee5c7e5c215f9230de52c3879.sam@gentoo> (raw)
commit: 273d518b5512ecdee5c7e5c215f9230de52c3879
Author: Marvin Schmidt <marv <AT> exherbo <DOT> org>
AuthorDate: Thu Jan 20 09:06:13 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
next reply other threads:[~2022-01-27 20:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 20:28 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-25 3:43 [gentoo-commits] proj/build-docbook-catalog:master commit in: / Sam James
2023-04-25 3:43 Sam James
2022-01-17 23:13 Andreas K. Hüttel
2021-10-08 12:22 Mike Frysinger
2021-10-05 1:14 Mike Frysinger
2021-10-05 1:14 Mike Frysinger
2021-10-03 4:01 Mike Frysinger
2021-10-03 4:01 Mike Frysinger
2021-10-03 4:01 Mike Frysinger
2021-10-03 4:01 Mike Frysinger
2021-10-03 4:01 Mike Frysinger
2021-10-03 4:01 Mike Frysinger
2021-10-03 4:01 Mike Frysinger
2021-10-02 6:20 Mike Frysinger
2021-10-02 6:20 Mike Frysinger
2021-10-02 6:17 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1643315307.273d518b5512ecdee5c7e5c215f9230de52c3879.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox