[Bug 233872] mergemaster(8) Re-run mode regression, fails needlessly with no src/Makefile.inc1 present

[b***@freebsd.org]

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

Bug ID: 233872
Summary: mergemaster(8) Re-run mode regression, fails
needlessly with no src/Makefile.inc1 present
Product: Base System
Version: 12.0-STABLE
Hardware: Any
OS: Any
Status: New
Severity: Affects Some People
Priority: ---
Component: misc
Assignee: ***@FreeBSD.org
Reporter: ***@omnilan.de

Created attachment 199961
--> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=199961&action=edit
Restore mergemaster(8) Re-run possibility if no populated SRCDIR is in place.

Hello,

in r338114 [ https://svnweb.freebsd.org/base?view=revision&revision=338114 ],
usr.sbin/mergemaster.sh was extended to re-define \$SRCDIR if applicable.

Unfortunately, the extended tests for Makefile.inc1 introduced exit cases,
which are not needed if the user runs mergemaster(8) in Re-Run (-r) mode *1.
The attached patch *2 simply omits the Makefile.inc1 checks if RERUN was set.

Thanks,

-harry

*1) In my case, TEMPROOT was populated without the help of mergemaster(8), but
I see no reason why SRCDIR mustn't vanish during 1st-run and re-run, hence this
problem report.

*2) I'd prefer insterting
'[ -z "${RERUN}" ] &&'
over
'-z "${RERUN}" -a'
But I used the latter for consistency with the existing script, the two wastes
for internal test/stat invocations only applies to RERUN mode...

[b***@freebsd.org]

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

Mark Linimon <***@FreeBSD.org> changed:

What |Removed |Added
----------------------------------------------------------------------------
Keywords| |patch, regression