[vlc-commits] Fix the tools bootstrap version check

[Pyry Kontio]

vlc | branch: master | Pyry Kontio <pyry.kontio at drasa.eu> | Fri Oct 21 22:32:07 2016 +0300| [ee5fad6a354d4fde1bb98f715e0455c603599554] | committer: Jean-Baptiste Kempf

Fix the tools bootstrap version check

It was broken when ProtoBuf 3.1 was installed system-wide, for example.

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. This changes 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.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ee5fad6a354d4fde1bb98f715e0455c603599554
---

 extras/tools/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 94a1b57..8536a95 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