On 9/30/2017 11:48 PM, Tom Eastep wrote: > On 09/30/2017 09:48 AM, Matt Darfeuille wrote: >> On 9/30/2017 5:57 PM, Tom Eastep wrote: >>> On 09/30/2017 08:00 AM, Matt Darfeuille wrote: >>>> On 9/29/2017 9:05 PM, Tom Eastep wrote: >>>>> On 09/29/2017 10:25 AM, Matt Darfeuille wrote: >>>>>> On 9/29/2017 1:25 AM, Tom Eastep wrote: >>>>>>> On 09/28/2017 04:07 PM, Matt Darfeuille wrote: >>>>>>> >>>>>>>> >>>>>>>>> I used the 'release' script to add the tag, so it appears that the >>>>>>>>> test >>>>>>>>> to ensure that the correct branch is checked out before tagging didn't >>>>>>>>> catch the error. >>>>>>>>> >>>>>>>> >>>>>>>> Ok -- I'll see what I can do about it! >>>>>>> >>>>>>> Thanks! >>>>>>>>
Do you remember what command you used? My guess is that neither of the '-b' or '-B' options wer given to create the tags. When I wrote the release script, it could be invoked in 3 ways: - Use the -b option. - Use the -B option. - Create the tags on the current checked out branch. Apparently this is not desirable! :) To fix that we could do: - Require the use of one of the b options. - If neither of the -b options are given the script would default to -B (automatically detect which branch to use). >>>>>>>> >>>>>>>> While mistakingly installing shorewall6 5.1.7.1 built by the buil50 >>>>>>>> script i got the following: >>>>>>>> >>>>>>>> "install: cannot stat 'zones.annotated': No such file or directory >>>>>>>> >>>>>>>> ERROR: Failed to install -o matt -g None -m 0644 zones.annotated >>>>>>>> /usr/share/shorewall6/configfiles/" >>>>>>>> >>>>>>>> $ ls 5.1.7.1/shorewall6-5.1.7.1/configfiles/zones* >>>>>>>> 5.1.7.1/shorewall6-5.1.7.1/configfiles/zones >>>>>>>> >>>>>>> >>>>>>> Do you have the log from that build? >>>>>>> >>>>>> >>>>>> Actually, this error only happened when building in a subdirectory! >>>>>> >>>>> >>>>> ?? >>>>> >>>> >>>> I use the up-to-date build50 script to build Shorewall, eatch versions >>>> are build in a subdirectory which have as name the given version. >>>> So I append '/$2' to the variables 'LOGDIR' and 'DIR'. and then invoke >>>> build50 as follow: >>>> >>>> ./build50 -cs6lLi 5.1.7.2 >>>> >>>> While I was attempting to install shorewall6-5.1.7.2 I got the error >>>> mentioned above. >>>> The path given as argument2 to the function 'do_configfiles' was not >>>> correct and the configfiles were not annotated. >>> >>> Right -- the second argument is $BASEDIR/$SHOREWALLDIR/manpages. >>> >> >> My suggestion to correct that is to change '$BASEDIR' to '$DIR'. >> >>>> >>>> I have one question though: >>>> >>>> If the variable 'CONSOLIDATED' is not set the config files are not >>>> annotated. >>>> is this the expected behavior? >>> >>> CONSOLIDATED is set by the script when Shorewall6 is being built and >>> shorewall6.conf.xml does not exist. >>> >> >> Yes -- The command: >> >> do_configfiles $PWD $PWD/manpages 6 >> >> will not annotate for instance the 'zones' file. >> Am I missing something or should the 'zones' file also be annotated when >> 'CONSOLIDATED' is not set? > > All of the config files for which there is a manpage are annotated if > shorewall6.conf.xml does not exist, because in that event, CONSOLIDATED > does get set. > In that case, isn't the else clause superfluous ? -Matt -- Matt Darfeuille ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Shorewall-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
