diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py index eff2a4e23..dfa969328 100644 --- a/qutebrowser/utils/standarddir.py +++ b/qutebrowser/utils/standarddir.py @@ -302,8 +302,9 @@ def _move_windows(): new_config_dir = os.path.join(new_appdata_dir, 'config') _create(new_config_dir) for f in os.listdir(old_appdata_dir): - _move_data(os.path.join(old_appdata_dir, f), - os.path.join(new_config_dir, f)) + if f != 'cache': + _move_data(os.path.join(old_appdata_dir, f), + os.path.join(new_config_dir, f)) def _init_cachedir_tag(): diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py index 9f460e7e5..bf918eb1c 100644 --- a/tests/unit/utils/test_standarddir.py +++ b/tests/unit/utils/test_standarddir.py @@ -467,12 +467,15 @@ class TestDataMigrations: """Test moving configs on Windows.""" (files.local_data_dir / 'data' / 'blocked-hosts').ensure() (files.local_data_dir / 'qutebrowser.conf').ensure() + (files.local_data_dir / 'cache' / 'cachefile').ensure() standarddir._move_windows() assert (files.roaming_data_dir / 'data' / 'blocked-hosts').exists() assert (files.roaming_data_dir / 'config' / 'qutebrowser.conf').exists() + assert not (files.roaming_data_dir / 'cache').exists() + assert (files.local_data_dir / 'cache' / 'cachefile').exists() @pytest.mark.parametrize('args_kind', ['basedir', 'normal', 'none'])