Fix install-missing-packages when port is missing multiple dependencies
ClosedPublic
Actions

Authored by 0mp on Feb 22 2020, 8:49 PM.

Details

Reviewers

mat
trasz

Group Reviewers

O5: Ports Framework
portmgr

Commits

rP529956: Fix install-missing-packages when port is missing multiple dependencies

Summary

Fix install-missing-packages when port is missing multiple dependencies

The current implementation of install-missing-packages does not handle
correctly the situation when a port is missing multiple dependencies. pkg(8)
would only get the first missing origin as an argument. All the other origins
would be listed on new lines and would not be passed to pkg(8).

This patch replaces newlines with spaces to avoid this problem. An alternative
solution would be to replace ECHO_CMD with "printf %s" and unquote the _dirs
variable. The implemented solution is cleaner, however, in my opinion (less
magical).

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244215

Test Plan

Test with both default SU_CMD and SU_CMD= /usr/local/bin/sudo -E sh -c set in /etc/make.conf.

Diff Detail

Repository

rP FreeBSD ports repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

0mp created this revision.Feb 22 2020, 8:49 PM

Owners added a reviewer: O5: Ports Framework.Feb 22 2020, 8:49 PM

Herald added a reviewer: portmgr. · View Herald TranscriptFeb 22 2020, 8:49 PM

Harbormaster completed remote builds in B29534: Diff 68683.Feb 22 2020, 8:49 PM

0mp edited the summary of this revision. (Show Details)Feb 22 2020, 8:50 PM

mat added inline comments.Feb 25 2020, 2:05 PM

Mk/bsd.port.mk
4338 ↗	(On Diff #68683)	I would use `\| ${XARGS}` which will take care of that.

0mp planned changes to this revision.Feb 25 2020, 7:31 PM

0mp added inline comments.

Mk/bsd.port.mk
4338 ↗	(On Diff #68683)	Hmm, sure, although I think that tr is more explicit.

Use XARGS instead of TR

Harbormaster completed remote builds in B29615: Diff 68822.Feb 25 2020, 7:59 PM

tobik added a subscriber: tobik.Feb 26 2020, 6:49 AM

tobik added inline comments.

Mk/bsd.port.mk
4338 ↗	(On Diff #68683)	This should be `${SU_CMD} "${ECHO_CMD} \"$${_dirs}\" \| ${SED} 's%${PORTSDIR}/%%g' \| ${XARGS} ${PKG_BIN} install -A"` or even better push the su outwards as much as possible `${ECHO_CMD} "$${_dirs}" \| ${SED} "s%${PORTSDIR}/%%g" \| ${SU_CMD} "${XARGS} ${PKG_BIN} install -A"`

0mp added inline comments.Feb 26 2020, 12:06 PM

Mk/bsd.port.mk
4338 ↗	(On Diff #68683)	We've tried that approach, @tobik. The problem is that then you cannot have interactive prompts from pkg (stdin is taken by xargs).

tobik added inline comments.Feb 26 2020, 2:17 PM

Mk/bsd.port.mk
4338 ↗	(On Diff #68683)	I see. Luckily there seems to be an xargs(1) flag for exactly that, `-o`: ${ECHO_CMD} "$${_dirs}" \| ${SED} "s%${PORTSDIR}/%%g" \| ${SU_CMD} "${XARGS} -o ${PKG_BIN} install -A"