mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 06:52:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-file-exists' into 'master'

Browse source 
Vagrantfile: fix undefined method `exists?' error

See merge request fdroid/fdroidserver!1558
This commit is contained in:
Hans-Christoph Steiner 2024-11-18 21:09:22 +00:00
commit 3bd2bc69d3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
buildserver/Vagrantfile vendored
View file

@ -14,7 +14,7 @@ configfile = {
srvpath = Pathname.new(File.dirname(__FILE__)).realpath srvpath = Pathname.new(File.dirname(__FILE__)).realpath
configpath = File.join(srvpath, "/Vagrantfile.yaml") configpath = File.join(srvpath, "/Vagrantfile.yaml")
if File.exists? configpath if File.exist? configpath
c = YAML.load_file(configpath) c = YAML.load_file(configpath)
if c and not c.empty? if c and not c.empty?
c.each do |k,v| c.each do |k,v|
@ -86,7 +86,7 @@ Vagrant.configure("2") do |config|
# Make sure dir exists to mount to, since buildserver/ is # Make sure dir exists to mount to, since buildserver/ is
# automatically mounted as /vagrant in the guest VM. This is more # automatically mounted as /vagrant in the guest VM. This is more
# necessary with 9p synced folders # necessary with 9p synced folders
Dir.mkdir('cache') unless File.exists?('cache') Dir.mkdir('cache') unless File.exist?('cache')
# Root partition needs to be resized to the new allocated space # Root partition needs to be resized to the new allocated space
config.vm.provision "shell", inline: <<-SHELL config.vm.provision "shell", inline: <<-SHELL