Date: Wed, 11 Oct 2023 08:41:03 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a19cc8636d02 - main - ports-mgmt/poudriere: Remove duplicate patch Message-ID: <202310110841.39B8f3Fp018553@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=a19cc8636d027bb5610c2c54487192a29335a748 commit a19cc8636d027bb5610c2c54487192a29335a748 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2023-10-11 08:39:36 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2023-10-11 08:39:36 +0000 ports-mgmt/poudriere: Remove duplicate patch I committed this patch by mistake in f122949e7409b0c6c8118914283e497923687f42 --- .../patch-628d150d645d34deeab7882d7056c8f7c868159d | 37 ---------------------- 1 file changed, 37 deletions(-) diff --git a/ports-mgmt/poudriere/files/patch-628d150d645d34deeab7882d7056c8f7c868159d b/ports-mgmt/poudriere/files/patch-628d150d645d34deeab7882d7056c8f7c868159d deleted file mode 100644 index 335e4fb43e16..000000000000 --- a/ports-mgmt/poudriere/files/patch-628d150d645d34deeab7882d7056c8f7c868159d +++ /dev/null @@ -1,37 +0,0 @@ -From 628d150d645d34deeab7882d7056c8f7c868159d Mon Sep 17 00:00:00 2001 -From: Baptiste Daroussin <bapt@FreeBSD.org> -Date: Wed, 11 Oct 2023 08:52:08 +0200 -Subject: [PATCH] options: support both dialog4ports and portconfig - ---- - src/share/poudriere/options.sh | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/share/poudriere/options.sh b/src/share/poudriere/options.sh -index 745c20d80..51a9aff97 100755 ---- src/share/poudriere/options.sh -+++ src/share/poudriere/options.sh -@@ -155,7 +155,13 @@ fi - export PORTSDIR=`pget ${PTNAME} mnt` - [ -d "${PORTSDIR}/ports" ] && PORTSDIR="${PORTSDIR}/ports" - [ -z "${PORTSDIR}" ] && err 1 "No such ports tree: ${PTNAME}" --command -v dialog4ports >/dev/null 2>&1 || err 1 "You must have ports-mgmt/dialog4ports installed on the host to use this command." -+if command -v portconfig >/dev/null 2>&1; then -+ d4p=portconfig -+elif command -v dialog4ports >/dev/null 2>&1; then -+ d4p=dialog4ports -+else -+ err 1 "You must have ports-mgmt/dialog4ports or ports-mgmt/portconfig installed on the host to use this command." -+fi - - read_packages_from_params "$@" - -@@ -205,7 +211,7 @@ for originspec in $(listed_ports show_moved); do - env ${flavor:+FLAVOR=${flavor}} \ - make PORT_DBDIR=${PORT_DBDIR} \ - PKG_BIN=`which pkg-static` \ -- DIALOG4PORTS=`which dialog4ports` \ -+ DIALOG4PORTS=`which $d4p` \ - LOCALBASE=/nonexistent \ - -C ${PORTSDIR}/${origin} \ - ${RECURSE_COMMAND}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310110841.39B8f3Fp018553>