瀏覽代碼

Vagrantfile fixes

remove borgbackup.egg-info dir in fs_init (after rsync)

exclude macOS High Sierra upgrade on the darwin64 machine

(cherry picked from commit 6f3a106b5ee5371337ba2b1441716dd5d5796593)
Thomas Waldmann 7 年之前
父節點
當前提交
4308632040
共有 1 個文件被更改,包括 2 次插入0 次删除
  1. 2 0
      Vagrantfile

+ 2 - 0
Vagrantfile

@@ -60,6 +60,7 @@ def packages_darwin
     # install all the (security and other) updates
     sudo softwareupdate --ignore iTunesX
     sudo softwareupdate --ignore iTunes
+    sudo softwareupdate --ignore "Install macOS High Sierra"
     sudo softwareupdate --install --all
     # get osxfuse 3.x release code from github:
     curl -s -L https://github.com/osxfuse/osxfuse/releases/download/osxfuse-3.7.1/osxfuse-3.7.1.dmg >osxfuse.dmg
@@ -319,6 +320,7 @@ def fs_init(user)
   return <<-EOF
     # clean up (wrong/outdated) stuff we likely got via rsync:
     rm -rf /vagrant/borg/borg/.tox 2> /dev/null
+    rm -rf /vagrant/borg/borg/borgbackup.egg-info 2> /dev/null
     rm -rf /vagrant/borg/borg/__pycache__ 2> /dev/null
     find /vagrant/borg/borg/borg -name '__pycache__' -exec rm -rf {} \\;  2> /dev/null
     chown -R #{user} /vagrant/borg