Gilles has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334249 )

Change subject: Loosen LSB version check
......................................................................

Loosen LSB version check

Make the lsb.version check a regular expression test rather than
a strict equality match. Use this new loose check ability to test for
any Debian 8.x version in the base image.

Bug: T155735
Change-Id: I12619484e8e4dd880ce42902c910ec54aaf18511
Co-Authored-By: Bryan Davis <bd...@wikimedia.org>
---
M Gemfile.lock
M lib/mediawiki-vagrant/lsb_check/provisioner.rb
M lib/mediawiki-vagrant/version.rb
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/49/334249/1

diff --git a/Gemfile.lock b/Gemfile.lock
index 95a9b5f..132f6c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,7 +24,7 @@
 PATH
   remote: .
   specs:
-    mediawiki-vagrant (0.14.0)
+    mediawiki-vagrant (0.14.1)
 
 GEM
   remote: https://rubygems.org/
diff --git a/lib/mediawiki-vagrant/lsb_check/provisioner.rb 
b/lib/mediawiki-vagrant/lsb_check/provisioner.rb
index e6c60e0..92c199b 100644
--- a/lib/mediawiki-vagrant/lsb_check/provisioner.rb
+++ b/lib/mediawiki-vagrant/lsb_check/provisioner.rb
@@ -10,7 +10,7 @@
           REQUIRED_VERSION=#{config.version}
           VENDOR=$(lsb_release -is)
           VERSION=$(lsb_release -rs)
-          if ! [[ $VENDOR == $REQUIRED_VENDOR && $VERSION == $REQUIRED_VERSION 
]]; then
+          if ! [[ $VENDOR == $REQUIRED_VENDOR && $VERSION =~ $REQUIRED_VERSION 
]]; then
             echo "MediaWiki-Vagrant requires a $REQUIRED_VENDOR 
$REQUIRED_VERSION guest OS"
             echo 'Your guest OS reports:'
             lsb_release -irc | sed 's/^/    /'
diff --git a/lib/mediawiki-vagrant/version.rb b/lib/mediawiki-vagrant/version.rb
index f401f2b..28b2d7e 100644
--- a/lib/mediawiki-vagrant/version.rb
+++ b/lib/mediawiki-vagrant/version.rb
@@ -1,3 +1,3 @@
 module MediaWikiVagrant
-  VERSION = '0.14.0'
+  VERSION = '0.14.1'
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/334249
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12619484e8e4dd880ce42902c910ec54aaf18511
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to