From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/build-docbook-catalog:master commit in: /
Date: Tue, 25 Apr 2023 03:43:01 +0000 (UTC) [thread overview]
Message-ID: <1682394171.158daca4d8dc373b5b6c5757cfa6491b6eda3b18.sam@gentoo> (raw)
commit: 158daca4d8dc373b5b6c5757cfa6491b6eda3b18
Author: Raul E Rangel <rrangel <AT> chromium <DOT> org>
AuthorDate: Tue Apr 4 21:57:13 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 03:42:51 2023 +0000
URL: https://gitweb.gentoo.org/proj/build-docbook-catalog.git/commit/?id=158daca4
Fix incorrect cp when using ROOT
We were missing the ROOT prefix on the cp operation:
+ [[ -r /build/arm64-generic//etc/xml/catalog ]]
+ xmllint /build/arm64-generic//etc/xml/catalog
+ [[ ! -r /build/arm64-generic//etc/xml/catalog ]]
+ verb 'Found XML Catalog root /etc/xml/catalog'
+ false
+ verb ' Cleaning existing /etc/xml/docbook delegates from /etc/xml/catalog'
+ false
+ cp /etc/xml/catalog /etc/xml/catalog.tmp
+ clean_catalog file:///etc/xml/docbook /etc/xml/catalog.tmp
+ local list f regex=file:///etc/xml/docbook catalog=/build/arm64-generic//etc/xml/catalog.tmp
++ grep -E --only-matching file:///etc/xml/docbook /build/arm64-generic//etc/xml/catalog.tmp
++ sort -u
grep: /build/arm64-generic//etc/xml/catalog.tmp: No such file or directory
Signed-off-by: Raul E Rangel <rrangel <AT> chromium.org>
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 cee9af0..2275703 100755
--- a/build-docbook-catalog
+++ b/build-docbook-catalog
@@ -187,7 +187,7 @@ create_catalogs() {
verb "Found XML Catalog root ${ROOTCATALOG}"
# clean out existing entries
verb " Cleaning existing ${CATALOG} delegates from ${ROOTCATALOG}"
- cp "${ROOTCATALOG}" "${ROOTCATALOG}.tmp"
+ cp "${ROOT}${ROOTCATALOG}" "${ROOT}${ROOTCATALOG}.tmp"
clean_catalog "file://${CATALOG}" "${ROOTCATALOG}.tmp"
fi
next reply other threads:[~2023-04-25 3:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-25 3:43 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
2022-01-27 20:28 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=1682394171.158daca4d8dc373b5b6c5757cfa6491b6eda3b18.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