BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/191895
Change subject: Fix ruby lib path for labs-vagrant command
......................................................................
Fix ruby lib path for labs-vagrant command
Bootstrapping the MediaWikiVagrant::Environment now includes loading
other files from the mediawiki-vagrant ruby plugin so we can't get away
with a single require_relative anymore in the labs-vagrant script.
Bug: T90176
Change-Id: I58eda267c5ccf1da0c8f309e127bb82dde57af77
---
M lib/labs-vagrant.rb
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/95/191895/1
diff --git a/lib/labs-vagrant.rb b/lib/labs-vagrant.rb
index e8e8898..4a34f56 100755
--- a/lib/labs-vagrant.rb
+++ b/lib/labs-vagrant.rb
@@ -1,6 +1,10 @@
#!/usr/bin/env ruby
-require_relative 'mediawiki-vagrant/environment'
+# Add mediawiki-vagrant ruby libs to default load path
+libdir = '/vagrant/lib'
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require 'mediawiki-vagrant/environment'
@mwv = MediaWikiVagrant::Environment.new('/vagrant')
COMMIT_CHANGES = "Ok. Run 'labs-vagrant provision' to apply your changes."
--
To view, visit https://gerrit.wikimedia.org/r/191895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58eda267c5ccf1da0c8f309e127bb82dde57af77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
