jenkins-bot has submitted this change and it was merged.
Change subject: Use a hack to make labsvagrant import files relative to source
......................................................................
Use a hack to make labsvagrant import files relative to source
require_relative is Ruby 1.9+ only.
Ruby is so awesome!11!
Change-Id: If2366ee94475c54d23b12abf4eac3fe84c36b8f5
---
R lib/labsvagrant.rb
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki-vagrant/labsvagrant.rb b/lib/labsvagrant.rb
similarity index 89%
rename from lib/mediawiki-vagrant/labsvagrant.rb
rename to lib/labsvagrant.rb
index 034e4a6..51ab047 100755
--- a/lib/mediawiki-vagrant/labsvagrant.rb
+++ b/lib/labsvagrant.rb
@@ -1,5 +1,10 @@
#!/usr/bin/env ruby
-require 'helpers'
+
+# This hack is required since < ruby1.9 do not support require_relative
+require 'pathname'
+SCRIPT_ROOT = File.dirname(Pathname.new(__FILE__).realpath)
+
+require "#{SCRIPT_ROOT}/mediawiki-vagrant/helpers.rb"
case ARGV.shift
when "list-roles"
--
To view, visit https://gerrit.wikimedia.org/r/86088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If2366ee94475c54d23b12abf4eac3fe84c36b8f5
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
