[vlc-devel] [PATCH] Fixes the extras/tools/bootstrap that was broken when ProtoBuf 3.1 was installed system-wide.

[Sean McGovern]

Hi Pyry,

On Oct 21, 2016 15:32, "Pyry Kontio" <pyry.kontio at drasa.eu> wrote:
>
> The bootstrap script that outputs which binary tools need to be
installed, incorrectly
> detects that Protocol Buffers 3.1 is a compatible version with 2.6. I
changed the
> check on the major version number to require it to be same, not just
bigger,
> since changes on the major version numbers might be breaking changes, as
was the case
> here.
> ---
>  extras/tools/bootstrap | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
> index 9666436..95870fa 100755
> --- a/extras/tools/bootstrap
> +++ b/extras/tools/bootstrap
> @@ -60,7 +60,7 @@ else
>      needminor=`echo $2|cut -d. -f2`
>      needmicro=`echo $2|cut -d. -f3`
>      [ -z "$needmicro" ] && needmicro=0
> -    if [ "$needmajor" -gt "$gotmajor" \
> +    if [ "$needmajor" -ne "$gotmajor" \
>           -o "$needmajor" -eq "$gotmajor" -a "$needminor" -gt "$gotminor"
\
>           -o "$needmajor" -eq "$gotmajor" -a "$needminor" -eq "$gotminor"
-a "$needmicro" -gt "$gotmicro" ]
>      then
> --

Oooh! Nice catch!

Can we be sure that all the other tools only bump major for a breaking
change, though? If so, LGTM.

----
Sean McGovern -  +1 613 862 6507
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20161021/a3859181/attachment.html>