mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3712 from ThomasWaldmann/fix-3706 

Vagrant: move cleanup steps to fs_init, fixes #3706
This commit is contained in:
TW 2018-03-24 00:13:35 +01:00 committed by GitHub
parent c722bd303a ad826cebad
commit 7127fb7f94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Vagrantfile vendored
View File

@ -264,9 +264,6 @@ def install_borg(fuse)
. borg-env/bin/activate . borg-env/bin/activate
pip install -U wheel # upgrade wheel, too old for 3.5 pip install -U wheel # upgrade wheel, too old for 3.5
cd borg 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 pip install -r requirements.d/development.txt
python setup.py clean python setup.py clean
EOF EOF
@ -331,6 +328,10 @@ end
def fs_init(user) def fs_init(user)
return <<-EOF 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 chown -R #{user} /vagrant/borg
touch ~#{user}/.bash_profile ; chown #{user} ~#{user}/.bash_profile touch ~#{user}/.bash_profile ; chown #{user} ~#{user}/.bash_profile
echo 'export LANG=en_US.UTF-8' >> ~#{user}/.bash_profile echo 'export LANG=en_US.UTF-8' >> ~#{user}/.bash_profile