Bug 233872 - mergemaster(8) Re-run mode regression, fails needlessly with no src/Makefile.inc1 present
Summary: mergemaster(8) Re-run mode regression, fails needlessly with no src/Makefile....
Status: New
Alias: None
Product: Base System
Classification: Unclassified
Component: misc (show other bugs)
Version: 12.0-STABLE
Hardware: Any Any
: --- Affects Some People
Assignee: freebsd-bugs (Nobody)
URL:
Keywords: patch, regression
Depends on:
Blocks:
 
Reported: 2018-12-08 17:11 UTC by Harald Schmalzbauer
Modified: 2024-04-16 14:21 UTC (History)
2 users (show)

See Also:

Attachments
Restore mergemaster(8) Re-run possibility if no populated SRCDIR is in place. (890 bytes, patch)
2018-12-08 17:11 UTC, Harald Schmalzbauer 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Harald Schmalzbauer 2018-12-08 17:11:58 UTC 
Created attachment 199961 [details]
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...