rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow existing empty dir when migrating files

Browse Source 
Remove old empty directory if it exists - otherwise, we move old/data to
new/data/data.
This commit is contained in:
Florian Bruhin 2017-09-13 17:38:56 +02:00
parent 0498e042a0
commit f7d17c4c55
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/utils/standarddir.py
View File

@ -359,9 +359,11 @@ def _move_data(old, new):
log.init.debug("Migrating data from {} to {}".format(old, new)) log.init.debug("Migrating data from {} to {}".format(old, new))
if os.path.exists(new): if os.path.exists(new):
message.error("Failed to move data from {} as {} already exists!" if os.listdir(new):
message.error("Failed to move data from {} as {} is non-empty!"
.format(old, new)) .format(old, new))
return False return False
os.rmdir(new)
try: try:
shutil.move(old, new) shutil.move(old, new)

2
tests/unit/utils/test_standarddir.py
View File

@ -389,7 +389,7 @@ class TestDataMigrations:
standarddir._move_webengine_data() standarddir._move_webengine_data()
record = caplog.records[-1] record = caplog.records[-1]
expected = "Failed to move data from {} as {} already exists!".format( expected = "Failed to move data from {} as {} is non-empty!".format(
old_path, new_path) old_path, new_path)
assert record.message == expected assert record.message == expected