Date: Sat, 08 Dec 2018 17:11:58 +0000 From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 233872] mergemaster(8) Re-run mode regression, fails needlessly with no src/Makefile.inc1 present Message-ID: <bug-233872-227@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D233872 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: bugs@FreeBSD.org Reporter: bugzilla.freebsd@omnilan.de Created attachment 199961 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D199961&action= =3Dedit Restore mergemaster(8) Re-run possibility if no populated SRCDIR is in plac= e. Hello, in r338114 [ https://svnweb.freebsd.org/base?view=3Drevision&revision=3D338= 114 ], 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 se= t. 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 was= tes for internal test/stat invocations only applies to RERUN mode... --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-233872-227>