Vagrant: move cleanup steps to fs_init, fixes #3706

so after a vagrant up or vagrant reload (which both rsync), we
can just call the fs_init and run_tests provisioning steps and do
not need to call install_borg again.
This commit is contained in:
Thomas Waldmann 2018-03-24 00:03:55 +01:00 committed by Milkey Mouse
parent 52be21c690
commit 6b42562c8c
No known key found for this signature in database
GPG Key ID: C6EF5A02F5647987
1 changed files with 4 additions and 3 deletions

7
Vagrantfile vendored
View File

@ -85,9 +85,6 @@ def install_borg(fuse)
. borg-env/bin/activate
pip install -U wheel # upgrade wheel, too old for 3.5
cd borg
# clean up (wrong/outdated) stuff we likely got via rsync:
rm -rf __pycache__
find src -name '__pycache__' -exec rm -rf {} \\;
pip install -r requirements.d/development.txt
python setup.py clean
EOF
@ -152,6 +149,10 @@ end
def fs_init(user)
return <<-EOF
# clean up (wrong/outdated) stuff we likely got via rsync:
rm -rf /vagrant/borg/borg/.tox
rm -rf /vagrant/borg/borg/__pycache__
find /vagrant/borg/borg/src -name '__pycache__' -exec rm -rf {} \\;
chown -R #{user} /vagrant/borg
touch ~#{user}/.bash_profile ; chown #{user} ~#{user}/.bash_profile
echo 'export LANG=en_US.UTF-8' >> ~#{user}/.bash_profile