[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Notify user when gem version of plugin is installed

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334498 )

Change subject: Notify user when gem version of plugin is installed
..


Notify user when gem version of plugin is installed

Follow up to c8ca59051837 that adds a check for the deprecated gem
version of the mediawiki-vagrant plugin. When detected the user will be
given a message explaining how to uninstall the plugin and the current
action will be halted.

Bug: T156380
Change-Id: Iaeacff7edabb5d8bf661c8e51093b966806b3e6c
---
M Vagrantfile
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Vagrantfile b/Vagrantfile
index ad04acb..051da69 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -33,6 +33,15 @@
 require 'ipaddr'
 require 'socket'
 
+# T156380: Check to see if the legacy gem version of the plugin is installed
+if Vagrant.has_plugin?('mediawiki-vagrant')
+raise <<-EOS
+
+The deprecated mediawiki-vagrant plugin is installed.
+Please remove it by running `vagrant plugin uninstall mediawiki-vagrant`.
+EOS
+end
+
 mwv = MediaWikiVagrant::Environment.new(File.expand_path('..', __FILE__))
 settings = mwv.load_settings
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaeacff7edabb5d8bf661c8e51093b966806b3e6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Notify user when gem version of plugin is installed

2017-01-26 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334498 )

Change subject: Notify user when gem version of plugin is installed
..

Notify user when gem version of plugin is installed

Follow up to c8ca59051837 that adds a check for the deprecated gem
version of the mediawiki-vagrant plugin. When detected the user will be
given a message explaining how to uninstall the plugin and the current
action will be halted.

Bug: T156380
Change-Id: Iaeacff7edabb5d8bf661c8e51093b966806b3e6c
---
M Vagrantfile
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/98/334498/1

diff --git a/Vagrantfile b/Vagrantfile
index ad04acb..051da69 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -33,6 +33,15 @@
 require 'ipaddr'
 require 'socket'
 
+# T156380: Check to see if the legacy gem version of the plugin is installed
+if Vagrant.has_plugin?('mediawiki-vagrant')
+raise <<-EOS
+
+The deprecated mediawiki-vagrant plugin is installed.
+Please remove it by running `vagrant plugin uninstall mediawiki-vagrant`.
+EOS
+end
+
 mwv = MediaWikiVagrant::Environment.new(File.expand_path('..', __FILE__))
 settings = mwv.load_settings
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaeacff7edabb5d8bf661c8e51093b966806b3e6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 

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