epicknex/hererocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deal with read-only files when removing directories

Browse Source 
Fixes error on windows when installing from non-default
git repo (for some reason a few files in .git are read-only
and shutil.rmtree fails to remove them).
This commit is contained in:
Peter Melnichenko 2016-06-11 11:47:48 +03:00
parent 3eadfc5456
commit fa0a6f6a53
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hererocks.py
View File

@ -11,6 +11,7 @@ import os
import platform import platform
import re import re
import shutil import shutil
import stat
import string import string
import subprocess import subprocess
import sys import sys
@ -177,6 +178,16 @@ def check_existence(path):
def copy_dir(src, dst): def copy_dir(src, dst):
shutil.copytree(src, dst, ignore=lambda _, __: {".git"}) shutil.copytree(src, dst, ignore=lambda _, __: {".git"})
def remove_read_only_or_reraise(func, path, exc_info):
if not os.access(path, os.W_OK):
os.chmod(path, stat.S_IWUSR)
func(path)
else:
raise
def remove_dir(path):
shutil.rmtree(path, onerror=remove_read_only_or_reraise)
clever_http_git_whitelist = [ clever_http_git_whitelist = [
"http://github.com/", "https://github.com/", "http://github.com/", "https://github.com/",
"http://bitbucket.com/", "https://bitbucket.com/" "http://bitbucket.com/", "https://bitbucket.com/"
@ -1198,7 +1209,7 @@ class LuaJIT(Lua):
opts.location, "share", "lua", self.major_version, "jit") opts.location, "share", "lua", self.major_version, "jit")
if os.path.exists(jitlib_path): if os.path.exists(jitlib_path):
shutil.rmtree(jitlib_path) remove_dir(jitlib_path)
copy_dir("jit", jitlib_path) copy_dir("jit", jitlib_path)
@ -1489,7 +1500,7 @@ def setup_vs_and_rerun(vs_version, arch):
argv_h.write("\r\n".join(sys.argv).encode("UTF-8")) argv_h.write("\r\n".join(sys.argv).encode("UTF-8"))
exit_code = subprocess.call([bat_name]) exit_code = subprocess.call([bat_name])
shutil.rmtree(temp_dir) remove_dir(temp_dir)
sys.exit(exit_code) sys.exit(exit_code)
def setup_vs(target): def setup_vs(target):
@ -1689,7 +1700,7 @@ def main(argv=None):
os.chdir(start_dir) os.chdir(start_dir)
shutil.rmtree(temp_dir) remove_dir(temp_dir)
print("Done.") print("Done.")
sys.exit(0) sys.exit(0)

3
test/cli_test.py
View File

@ -61,6 +61,9 @@ class TestCLI(unittest.TestCase):
self.assertHererocksSuccess(["--lua", "latest", "--luarocks", "latest"], ["already installed"]) self.assertHererocksSuccess(["--lua", "latest", "--luarocks", "latest"], ["already installed"])
self.assertHererocksSuccess(["--luarocks", "latest", "--ignore-installed"], ["Fetching", "cached"]) self.assertHererocksSuccess(["--luarocks", "latest", "--ignore-installed"], ["Fetching", "cached"])
def test_install_latest_lua_with_luarocks_from_git(self):
self.assertHererocksSuccess(["--lua", "latest", "--luarocks", "https://github.com/mpeterv/luarocks@master"])
def test_verbose_install_bleeding_edge_luajit_with_latest_luarocks(self): def test_verbose_install_bleeding_edge_luajit_with_latest_luarocks(self):
self.assertHererocksSuccess(["--luajit", "@v2.1", "--luarocks", "latest", "--verbose"]) self.assertHererocksSuccess(["--luajit", "@v2.1", "--luarocks", "latest", "--verbose"])
self.assertSuccess(["lua", "-v"], ["LuaJIT 2.1.0"]) self.assertSuccess(["lua", "-v"], ["LuaJIT 2.1.0"])