jenkins-bot has submitted this change and it was merged.
Change subject: Fixed Style/IndentationWidth RuboCop offense
......................................................................
Fixed Style/IndentationWidth RuboCop offense
RuboCop actually missed many of these offenses which required manual
review and cleanup.
Bug: T106220
Change-Id: I0390db5f2c6259329cb3aae520162bee0fc9f209
---
M .rubocop.yml
M .rubocop_todo.yml
M Gemfile
M Gemfile.lock
M Rakefile
M Vagrantfile
M mediawiki-vagrant.gemspec
M support/packager/package.rb
M support/setup.rb
9 files changed, 217 insertions(+), 223 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop.yml b/.rubocop.yml
index b8f7361..c8f54ea 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,6 +6,7 @@
Exclude:
- 'mediawiki/**/*'
- 'mediawiki-*/**/*'
+ - 'puppet/modules/activemq/**/*'
- 'puppet/modules/cdh/**/*'
- 'puppet/modules/mariadb/**/*'
- 'puppet/modules/nginx/**/*'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index bf68d1f..58da8c5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -75,12 +75,6 @@
Style/IfUnlessModifier:
Enabled: false
-# Offense count: 45
-# Cop supports --auto-correct.
-# Configuration parameters: Width.
-Style/IndentationWidth:
- Enabled: false
-
# Offense count: 1
# Cop supports --auto-correct.
Style/LeadingCommentSpace:
diff --git a/Gemfile b/Gemfile
index 7ebd66f..fb190d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@
# https://github.com/mitchellh/vagrant/issues/5546
gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.7.2'
- gem 'rubocop', '~> 0.32.1', require: false
+ gem 'rubocop', '~> 0.33.0', require: false
end
group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 5fc27be..01f2b48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,7 +23,7 @@
PATH
remote: .
specs:
- mediawiki-vagrant (0.7.1)
+ mediawiki-vagrant (0.10.0)
GEM
remote: https://rubygems.org/
@@ -31,7 +31,7 @@
akami (1.2.2)
gyoku (>= 0.4.0)
nokogiri
- ast (2.0.0)
+ ast (2.1.0)
astrolabe (1.3.1)
parser (~> 2.2)
builder (3.2.2)
@@ -127,7 +127,7 @@
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.0)
- rubocop (0.32.1)
+ rubocop (0.33.0)
astrolabe (~> 1.3)
parser (>= 2.2.2.5, < 3.0)
powerpack (~> 0.1)
@@ -169,6 +169,6 @@
mediawiki-vagrant!
pry-byebug
rspec (~> 3.1, >= 3.1.0)
- rubocop (~> 0.32.1)
+ rubocop (~> 0.33.0)
vagrant!
yard (~> 0.8, >= 0.8.7.6)
diff --git a/Rakefile b/Rakefile
index 9da5752..1813787 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,7 +10,7 @@
PuppetLint::RakeTask.new(:lint) do |config|
gitmodules = File.expand_path('../.gitmodules', __FILE__)
config.ignore_paths = IO.readlines(gitmodules).grep(/\s*path\s*=\s*(\S+)/) {
- "#{$1}/**/*.pp"
+ "#{$1}/**/*.pp"
}
config.log_format = '%{path}:%{linenumber} %{KIND}: %{message}'
end
diff --git a/Vagrantfile b/Vagrantfile
index 5032800..2d58012 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -37,9 +37,9 @@
setup = Vagrant::Util::Platform.windows? ? 'setup.bat' : 'setup.sh'
if gemspec.nil?
- raise "The mediawiki-vagrant plugin hasn't been installed yet. Please run
`#{setup}`."
+ raise "The mediawiki-vagrant plugin hasn't been installed yet. Please run
`#{setup}`."
else
- installed = gemspec.version
+ installed = gemspec.version
latest = Gem::Version.new(MediaWikiVagrant::VERSION)
requirement = Gem::Requirement.new("~>
#{latest.segments.first(2).join('.')}")
@@ -52,213 +52,212 @@
settings = mwv.load_settings
Vagrant.configure('2') do |config|
- config.vm.hostname = 'mediawiki-vagrant.dev'
- config.package.name = 'mediawiki.box'
+ config.vm.hostname = 'mediawiki-vagrant.dev'
+ config.package.name = 'mediawiki.box'
- config.ssh.forward_agent = settings[:forward_agent]
- config.ssh.forward_x11 = settings[:forward_x11]
+ config.ssh.forward_agent = settings[:forward_agent]
+ config.ssh.forward_x11 = settings[:forward_x11]
- # Default VirtualBox provider
- config.vm.provider :virtualbox do |_vb, override|
- override.vm.box = 'trusty-cloud'
- override.vm.box_url =
'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box'
- override.vm.box_download_insecure = true
+ # Default VirtualBox provider
+ config.vm.provider :virtualbox do |_vb, override|
+ override.vm.box = 'trusty-cloud'
+ override.vm.box_url =
'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box'
+ override.vm.box_download_insecure = true
- override.vm.network :private_network, ip: settings[:static_ip]
+ override.vm.network :private_network, ip: settings[:static_ip]
+ end
+
+ # VMWare Fusion provider. Enable with `--provider=vmware_fusion`
+ config.vm.provider :vmware_fusion do |_vw, override|
+ override.vm.box = 'puppetlabs/ubuntu-14.04-64-puppet'
+ override.vm.network :private_network, ip: settings[:static_ip]
+ end
+
+ # Microsoft Hyper-V provider. Enable with `--provider=hyperv`
+ # Not quite in 'just works' shape yet.
+ #
+ # You must run vagrant from an administrator shell to interact
+ # with the Hyper-V virtual machines...
+ #
+ # Note you must configure networking manually in Hyper-V Manager!
+ # NAT and port redirection are not automatically set up for you.
+ #
+ config.vm.provider :hyperv do |_hyperv, override|
+ # Our default box doesn't have Hyper-V support...
+ override.vm.box = 'cirex/ubuntu-14.04'
+
+ override.vm.network :private_network, ip: settings[:static_ip]
+ end
+
+ # LXC provider. Enable wtih `--provider=lxc`
+ # Requires vagrant-lxc plugin and Vagrant 1.7+
+ config.vm.provider :lxc do |_lxc, override|
+ override.vm.box = 'Wikimedia/trusty64-puppet-lxc'
+ end
+
+ # Parallels provider. Enable with `--provider=parallels`
+ #
+ # Requires plugins:
+ # * Parallels provider - http://parallels.github.io/vagrant-parallels/
+ # $ vagrant plugin install vagrant-parallels
+ # * Puppet installer - https://github.com/petems/vagrant-puppet-install
+ # $ vagrant plugin install vagrant-puppet-install
+ #
+ # Note that port forwarding works via localhost but not via external
interfaces
+ # of the host machine by default...
+ config.vm.provider :parallels do |_parallels, override|
+ override.vm.box = 'parallels/ubuntu-14.04'
+
+ # Pin to a 3.x version, current as of this config writing.
+ override.puppet_install.puppet_version = '3.7.4'
+
+ override.vm.network :private_network, ip: settings[:static_ip]
+ end
+
+ config.vm.network :forwarded_port,
+ guest: 80, host: settings[:http_port], id: 'http'
+
+ unless settings[:forward_ports].nil?
+ settings[:forward_ports].each do |guest_port,host_port|
+ config.vm.network :forwarded_port,
+ :host => host_port, :guest => guest_port,
+ auto_correct: true
end
+ end
- # VMWare Fusion provider. Enable with `--provider=vmware_fusion`
- config.vm.provider :vmware_fusion do |_vw, override|
- override.vm.box = 'puppetlabs/ubuntu-14.04-64-puppet'
+ root_share_options = {:id => 'vagrant-root'}
- override.vm.network :private_network, ip: settings[:static_ip]
- end
+ if settings[:nfs_shares]
+ root_share_options[:type] = :nfs
+ root_share_options[:mount_options] =
['noatime','rsize=32767','wsize=32767','async']
+ root_share_options[:mount_options] << 'fsc' if settings[:nfs_cache]
+ config.nfs.map_uid = Process.uid
+ config.nfs.map_gid = Process.gid
+ else
+ root_share_options[:owner] = 'vagrant'
+ root_share_options[:group] = 'www-data'
+ end
- # Microsoft Hyper-V provider. Enable with `--provider=hyperv`
- # Not quite in 'just works' shape yet.
+ config.vm.synced_folder '.', '/vagrant', root_share_options
+
+ if !settings[:nfs_shares]
+ # www-data needs to write to the logs, but doesn't need write
+ # access for all of /vagrant
#
- # You must run vagrant from an administrator shell to interact
- # with the Hyper-V virtual machines...
- #
- # Note you must configure networking manually in Hyper-V Manager!
- # NAT and port redirection are not automatically set up for you.
- #
- config.vm.provider :hyperv do |_hyperv, override|
- # Our default box doesn't have Hyper-V support...
- override.vm.box = 'cirex/ubuntu-14.04'
+ # Users of NFS should not need this special export because of the
+ # global uid/gid map used for the NFS export. Attempts from within the
+ # VM to chmod files and folders to www-data:www-data will fail
+ # however, so avoid that in puppet code and account for it in shell
+ # scripts.
+ config.vm.synced_folder './logs', '/vagrant/logs',
+ id: 'vagrant-logs',
+ owner: 'www-data',
+ group: 'www-data'
+ end
- override.vm.network :private_network, ip: settings[:static_ip]
+ config.vm.provider :virtualbox do |vb|
+ # See http://www.virtualbox.org/manual/ch08.html for additional options.
+ vb.customize ['modifyvm', :id, '--memory', settings[:vagrant_ram]]
+ vb.customize ['modifyvm', :id, '--cpus', settings[:vagrant_cores]]
+ vb.customize ['modifyvm', :id, '--ostype', 'Ubuntu_64']
+ vb.customize ['modifyvm', :id, '--ioapic', 'on'] # Bug 51473
+
+ # Speed up dns resolution in some cases
+ vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
+ vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']
+
+ # To boot the VM in graphical mode, uncomment the following line:
+ # vb.gui = true
+ end
+
+ config.vm.provider :vmware_fusion do |vw|
+ vw.vmx['memsize'] = settings[:vagrant_ram]
+ vw.vmx['numvcpus'] = settings[:vagrant_cores]
+
+ # To boot the VM in graphical mode, uncomment the following line:
+ #vw.gui = true
+ end
+
+ config.vm.provider :lxc do |lxc|
+ lxc.customize 'cgroup.memory.limit_in_bytes', "#{settings[:vagrant_ram]}M"
+ end
+
+ config.vm.provision :lsb_check do |lsb|
+ lsb.version = '14.04'
+ end
+
+ config.vm.provision :mediawiki_reload if mwv.reload?
+
+ config.vm.provision :puppet do |puppet|
+ # Use empty module path to avoid an extra mount.
+ # See --modulepath below
+ puppet.module_path = []
+
+ # Tell Vagrant that the manifests are already on the guest
+ puppet.manifests_path = [:guest, '/vagrant/puppet/manifests']
+ puppet.manifest_file = 'site.pp'
+
+ puppet.options = [
+ '--modulepath', '/vagrant/puppet/modules',
+ '--hiera_config', '/vagrant/puppet/hiera.yaml',
+ '--verbose',
+ '--config_version', '/vagrant/puppet/extra/config-version',
+ '--logdest', "/vagrant/logs/puppet/puppet.#{mwv.commit ||
'unknown'}.log",
+ '--logdest', 'console',
+ '--write-catalog-summary',
+ '--detailed-exitcodes',
+ ]
+
+ # For more output, uncomment the following line:
+ puppet.options << '--debug' if ENV.include?('PUPPET_DEBUG')
+
+ # Windows's Command Prompt has poor support for ANSI escape sequences.
+ puppet.options << '--color=false' if Vagrant::Util::Platform.windows?
+
+ puppet.facter = {
+ 'fqdn' => config.vm.hostname,
+ 'git_user' => settings[:git_user],
+ 'forwarded_port' => settings[:http_port],
+ 'shared_apt_cache' => '/vagrant/cache/apt/',
+ 'environment' => ENV['MWV_ENVIRONMENT'] || 'vagrant',
+ }
+
+ if settings[:http_port] != 80
+ puppet.facter['port_fragment'] = ":#{settings[:http_port]}"
end
-
- # LXC provider. Enable wtih `--provider=lxc`
- # Requires vagrant-lxc plugin and Vagrant 1.7+
- config.vm.provider :lxc do |_lxc, override|
- override.vm.box = 'Wikimedia/trusty64-puppet-lxc'
- end
-
- # Parallels provider. Enable with `--provider=parallels`
- #
- # Requires plugins:
- # * Parallels provider - http://parallels.github.io/vagrant-parallels/
- # $ vagrant plugin install vagrant-parallels
- # * Puppet installer - https://github.com/petems/vagrant-puppet-install
- # $ vagrant plugin install vagrant-puppet-install
- #
- # Note that port forwarding works via localhost but not via external
interfaces
- # of the host machine by default...
- config.vm.provider :parallels do |_parallels, override|
- override.vm.box = 'parallels/ubuntu-14.04'
-
- # Pin to a 3.x version, current as of this config writing.
- override.puppet_install.puppet_version = '3.7.4'
-
- override.vm.network :private_network, ip: settings[:static_ip]
- end
-
- config.vm.network :forwarded_port,
- guest: 80, host: settings[:http_port], id: 'http'
-
- unless settings[:forward_ports].nil?
- settings[:forward_ports].each do |guest_port,host_port|
- config.vm.network :forwarded_port,
- :host => host_port, :guest => guest_port,
- auto_correct: true
- end
- end
-
- root_share_options = {:id => 'vagrant-root'}
if settings[:nfs_shares]
- root_share_options[:type] = :nfs
- root_share_options[:mount_options] =
['noatime','rsize=32767','wsize=32767','async']
- root_share_options[:mount_options] << 'fsc' if settings[:nfs_cache]
- config.nfs.map_uid = Process.uid
- config.nfs.map_gid = Process.gid
+ puppet.facter['share_owner'] = Process.uid
+ puppet.facter['share_group'] = Process.gid
else
- root_share_options[:owner] = 'vagrant'
- root_share_options[:group] = 'www-data'
+ puppet.facter['share_owner'] = 'vagrant'
+ puppet.facter['share_group'] = 'www-data'
end
- config.vm.synced_folder '.', '/vagrant', root_share_options
-
- if !settings[:nfs_shares]
- # www-data needs to write to the logs, but doesn't need write
- # access for all of /vagrant
- #
- # Users of NFS should not need this special export because of the
- # global uid/gid map used for the NFS export. Attempts from within the
- # VM to chmod files and folders to www-data:www-data will fail
- # however, so avoid that in puppet code and account for it in shell
- # scripts.
- config.vm.synced_folder './logs', '/vagrant/logs',
- id: 'vagrant-logs',
- owner: 'www-data',
- group: 'www-data'
+ # Derive a host IP from the configured static IP by getting the first
+ # usable IP in the 8-bit network
+ if settings[:static_ip]
+ network = IPAddr.new("#{settings[:static_ip]}/24")
+ puppet.facter['host_ip'] = network.to_range.take(2).last.to_s
end
-
- config.vm.provider :virtualbox do |vb|
- # See http://www.virtualbox.org/manual/ch08.html for additional
options.
- vb.customize ['modifyvm', :id, '--memory', settings[:vagrant_ram]]
- vb.customize ['modifyvm', :id, '--cpus', settings[:vagrant_cores]]
- vb.customize ['modifyvm', :id, '--ostype', 'Ubuntu_64']
- vb.customize ['modifyvm', :id, '--ioapic', 'on'] # Bug 51473
-
- # Speed up dns resolution in some cases
- vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
- vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']
-
- # To boot the VM in graphical mode, uncomment the following line:
- # vb.gui = true
- end
-
- config.vm.provider :vmware_fusion do |vw|
- vw.vmx['memsize'] = settings[:vagrant_ram]
- vw.vmx['numvcpus'] = settings[:vagrant_cores]
-
- # To boot the VM in graphical mode, uncomment the following line:
- #vw.gui = true
- end
-
- config.vm.provider :lxc do |lxc|
- lxc.customize 'cgroup.memory.limit_in_bytes',
- "#{settings[:vagrant_ram]}M"
- end
-
- config.vm.provision :lsb_check do |lsb|
- lsb.version = '14.04'
- end
-
- config.vm.provision :mediawiki_reload if mwv.reload?
-
- config.vm.provision :puppet do |puppet|
- # Use empty module path to avoid an extra mount.
- # See --modulepath below
- puppet.module_path = []
- # Tell Vagrant that the manifests are already on the guest
- puppet.manifests_path = [:guest, '/vagrant/puppet/manifests']
- puppet.manifest_file = 'site.pp'
-
- puppet.options = [
- '--modulepath', '/vagrant/puppet/modules',
- '--hiera_config', '/vagrant/puppet/hiera.yaml',
- '--verbose',
- '--config_version', '/vagrant/puppet/extra/config-version',
- '--logdest', "/vagrant/logs/puppet/puppet.#{mwv.commit ||
'unknown'}.log",
- '--logdest', 'console',
- '--write-catalog-summary',
- '--detailed-exitcodes',
- ]
-
- # For more output, uncomment the following line:
- puppet.options << '--debug' if ENV.include?('PUPPET_DEBUG')
-
- # Windows's Command Prompt has poor support for ANSI escape sequences.
- puppet.options << '--color=false' if Vagrant::Util::Platform.windows?
-
- puppet.facter = {
- 'fqdn' => config.vm.hostname,
- 'git_user' => settings[:git_user],
- 'forwarded_port' => settings[:http_port],
- 'shared_apt_cache' => '/vagrant/cache/apt/',
- 'environment' => ENV['MWV_ENVIRONMENT'] || 'vagrant',
- }
-
- if settings[:http_port] != 80
- puppet.facter['port_fragment'] = ":#{settings[:http_port]}"
- end
-
- if settings[:nfs_shares]
- puppet.facter['share_owner'] = Process.uid
- puppet.facter['share_group'] = Process.gid
- else
- puppet.facter['share_owner'] = 'vagrant'
- puppet.facter['share_group'] = 'www-data'
- end
-
- # Derive a host IP from the configured static IP by getting the first
- # usable IP in the 8-bit network
- if settings[:static_ip]
- network = IPAddr.new("#{settings[:static_ip]}/24")
- puppet.facter['host_ip'] = network.to_range.take(2).last.to_s
- end
- end
+ end
end
# Migrate {apt,composer}-cache to cache/{apt,composer}
['apt', 'composer'].each do |type|
- src = mwv.path("#{type}-cache")
+ src = mwv.path("#{type}-cache")
- if src.directory?
- dst = mwv.path('cache', type)
+ if src.directory?
+ dst = mwv.path('cache', type)
- src.each_child do |src_file|
- unless src_file.directory? || src_file.basename.fnmatch?('.*')
- src_file.rename(dst.join(src_file.basename)) rescue nil
- end
- end
+ src.each_child do |src_file|
+ unless src_file.directory? || src_file.basename.fnmatch?('.*')
+ src_file.rename(dst.join(src_file.basename)) rescue nil
+ end
end
+ end
end
# Load custom Vagrantfile overrides from 'Vagrantfile-extra.rb'
@@ -267,6 +266,6 @@
# to the parent directory. Editing it without copying it will only cause
# sadness.
begin
- require mwv.path('Vagrantfile-extra')
+ require mwv.path('Vagrantfile-extra')
rescue LoadError
end
diff --git a/mediawiki-vagrant.gemspec b/mediawiki-vagrant.gemspec
index 4dd644c..e88710a 100644
--- a/mediawiki-vagrant.gemspec
+++ b/mediawiki-vagrant.gemspec
@@ -3,26 +3,26 @@
require 'mediawiki-vagrant/version'
Gem::Specification.new do |s|
- s.name = 'mediawiki-vagrant'
- s.summary = 'A portable MediaWiki development environment.'
- s.description = (<<-end_).split.join(' ')
- MediaWiki-Vagrant is a portable MediaWiki development environment. It
- consists of a set of configuration scripts that automate the creation
- of a virtual machine that runs MediaWiki.
- end_
+ s.name = 'mediawiki-vagrant'
+ s.summary = 'A portable MediaWiki development environment.'
+ s.description = (<<-end_).split.join(' ')
+ MediaWiki-Vagrant is a portable MediaWiki development environment. It
+ consists of a set of configuration scripts that automate the creation
+ of a virtual machine that runs MediaWiki.
+ end_
- s.platform = Gem::Platform::RUBY
- s.authors = ['Ori Livneh']
- s.email = ['[email protected]']
- s.homepage = 'https://github.com/wikimedia/mediawiki-vagrant'
- s.licenses = ['MIT']
+ s.platform = Gem::Platform::RUBY
+ s.authors = ['Ori Livneh']
+ s.email = ['[email protected]']
+ s.homepage = 'https://github.com/wikimedia/mediawiki-vagrant'
+ s.licenses = ['MIT']
- s.files = Dir['{lib}/**/*'] + ['LICENSE', 'Gemfile', 'README.md']
- s.version = MediaWikiVagrant::VERSION
+ s.files = Dir['{lib}/**/*'] + ['LICENSE', 'Gemfile', 'README.md']
+ s.version = MediaWikiVagrant::VERSION
- s.require_paths = ['lib']
+ s.require_paths = ['lib']
- s.add_development_dependency 'cucumber', '~> 2.0.0.rc4'
- s.add_development_dependency 'rspec', '~> 3.1', '>= 3.1.0'
- s.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7.6'
+ s.add_development_dependency 'cucumber', '~> 2.0.0.rc4'
+ s.add_development_dependency 'rspec', '~> 3.1', '>= 3.1.0'
+ s.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7.6'
end
diff --git a/support/packager/package.rb b/support/packager/package.rb
index fd1e345..ef27596 100755
--- a/support/packager/package.rb
+++ b/support/packager/package.rb
@@ -110,7 +110,7 @@
plugins_dir = $contents_dir + 'Plugins'
$url_config['Vagrant']['Plugins'].each do |_plugin, url|
- download_file(plugins_dir, url)
+ download_file(plugins_dir, url)
end
template = $packager_dir + 'template'
@@ -151,7 +151,7 @@
puts 'Creating iso image to distribute...'
# -r: Rock Ridge with recommended values for permissions, etc.
if system('which genisoimage >/dev/null 2>&1')
- system('genisoimage', '-r', '-o', $iso_file.to_s, $contents_dir.to_s)
+ system('genisoimage', '-r', '-o', $iso_file.to_s, $contents_dir.to_s)
else
puts '"genisoimage" not found. Iso image not created.'
end
diff --git a/support/setup.rb b/support/setup.rb
index f973ef6..70f681d 100644
--- a/support/setup.rb
+++ b/support/setup.rb
@@ -6,12 +6,12 @@
require 'mediawiki-vagrant/setup'
begin
- setup = MediaWikiVagrant::Setup.new(ARGV.shift)
- setup.run
+ setup = MediaWikiVagrant::Setup.new(ARGV.shift)
+ setup.run
rescue OptionParser::InvalidOption => e
- STDERR.puts e
- STDERR.puts setup.options
+ STDERR.puts e
+ STDERR.puts setup.options
rescue MediaWikiVagrant::Setup::ExecutionError => e
- STDERR.puts e
- exit e.status.exitstatus
+ STDERR.puts e
+ exit e.status.exitstatus
end
--
To view, visit https://gerrit.wikimedia.org/r/234323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0390db5f2c6259329cb3aae520162bee0fc9f209
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dduvall <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
