Date: Thu, 27 Nov 2025 11:27:32 -0800 From: Mark Millard <marklmi@yahoo.com> To: "des@freebsd.org" <des@FreeBSD.org>, dev-commits-src-main <dev-commits-src-main@freebsd.org> Subject: RE: git: b3e53f9fff11 - main - git-arc: Don't require devel/arcanist Message-ID: <036233AD-5FE7-49AE-B0DA-AF52F321011E@yahoo.com> References: <036233AD-5FE7-49AE-B0DA-AF52F321011E.ref@yahoo.com>
index | next in thread | previous in thread | raw e-mail
Dag-Erling Smørgrav <des_at_FreeBSD.org> wrote on Date: Thu, 27 Nov 2025 18:07:35 UTC : > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b3e53f9fff11e2e6289f5c69ad08f5acd727abd6 > > commit b3e53f9fff11e2e6289f5c69ad08f5acd727abd6 > Author: Dag-Erling Smørgrav <des@FreeBSD.org> > AuthorDate: 2025-11-27 18:07:15 +0000 > Commit: Dag-Erling Smørgrav <des@FreeBSD.org> > CommitDate: 2025-11-27 18:07:15 +0000 > > git-arc: Don't require devel/arcanist > > Instead of invoking just “arc”, which requires devel/arcanist, which > conflicts with archivers/arc, invoke the underlying script installed by > devel/arcanist-lib. > > Reviewed by: markj > Differential Revision: https://reviews.freebsd.org/D53942 > --- > tools/tools/git/git-arc.sh | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh > index fa618cdcbc22..f33a73334799 100644 > --- a/tools/tools/git/git-arc.sh > +++ b/tools/tools/git/git-arc.sh > @@ -171,6 +171,20 @@ get_bool_config() > test "$(git config --bool --get $1 2>/dev/null || echo $2)" != "false" > } > > +# > +# Invoke the actual arc command. This allows us to only rely on the > +# devel/arcanist-lib port, which installs the actual script, rather than > +# the devel/arcanist-port, which installs a symlink in ${LOCALBASE}/bin > +# but conflicts with the archivers/arc port. > +# > +: ${LOCALBASE:=$(sysctl -n user.localbase)} > +: ${LOCALBASE:=/usr/local} > +: ${ARC_CMD:=${LOCALBASE}/lib/php/arcanist/bin/arc} > +arc() > +{ > + ${ARC_CMD} "$@" > +} > + > # > # Filter the output of call-conduit to remove the warnings that are generated > # for some installations where openssl module is mysteriously installed twice so The committed source update still leaves it with: which arc >/dev/null 2>&1 || err "arc is required, install devel/arcanist" instead of: [ -x "${ARC_CMD}" ] || err "arc is required, install devel/arcanist-lib" Somehow the "fix existence check" based diff from: https://reviews.freebsd.org/D53942 is not what was committed. === Mark Millard marklmi at yahoo.comhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?036233AD-5FE7-49AE-B0DA-AF52F321011E>