On 1/27/2019 7:16 PM, Tom Eastep wrote: > On 1/27/19 8:32 AM, Matt Darfeuille wrote: >> - Unify output redirection >> >> Signed-off-by: Matt Darfeuille <matd...@gmail.com> >> --- >> build/build50 | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/build/build50 b/build/build50 >> index b03aae46..0731e7d8 100755 >> --- a/build/build50 >> +++ b/build/build50 >> @@ -895,7 +895,7 @@ if [ -n >> "${BUILDCORE}${BUILD6}${BUILDINIT}${BUILDLITE}${BUILD6LITE}${BUILDSTD}" >> >> manpagedir=$PWD/manpages >> >> - pushd Samples6 2> /dev/null >> + pushd Samples6 > /dev/null >> >> for dir in *; do >> if [ -d $dir ]; then >> @@ -903,7 +903,11 @@ if [ -n >> "${BUILDCORE}${BUILD6}${BUILDINIT}${BUILDLITE}${BUILD6LITE}${BUILDSTD}" >> progress_message "*** $PWD ***" >> >> if [ -n "$CONSOLIDATED" ]; then >> - do_configfiles $PWD $BASEDIR/$SHOREWALLDIR/manpages '' >> + if [ -d $BASEDIR/$VERSION/$SHOREWALLDIR/manpages ]; then >> + do_configfiles $PWD >> $BASEDIR/$VERSION/$SHOREWALLDIR/manpages '' >> + else >> + do_configfiles $PWD $BASEDIR/$SHOREWALLDIR/manpages >> '' >> + fi >> else >> do_configfiles $PWD $manpagedir 6 >> fi >> > > Applied -- thanks Matt. > > When releasing 5.2.2, I noticed that the new 'git push' logic expects > base releases to have their own git branch (e.g., 'release 5.2.2-base' > tries to push branch 5.2.2). This is different from the old "push the > checked out branch" behavior, which would push 'master' if the > $BASEVERSION branch did not exist. Not a big deal, as I just created the > 5.2.2 branches and re-released, but I often don't create the new branch > until I want to modify master for the next release or if I need to > create the .1 patch release. >
The follow-on patch should address the above, thoughts? P.S. Please don't merge the "Request For Comments" patch wright away! :) -- Matthieu Darfeuille _______________________________________________ Shorewall-devel mailing list Shorewall-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/shorewall-devel