diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-03-15 15:47:10 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-03-15 15:47:10 +0100 |
| commit | 787311702ceca9dce7fdc553afcb4b63c9c3a8ca (patch) | |
| tree | 1d8ce0957e78f1a84b9779b0246d6579a558cc3c | |
| parent | bbff048e0781a77fa4ae8a02ced14f08b4b4e974 (diff) | |
| parent | 8cccad82e2be81af4638c8faf8374b7ac20e51f7 (diff) | |
| download | mullvadvpn-787311702ceca9dce7fdc553afcb4b63c9c3a8ca.tar.xz mullvadvpn-787311702ceca9dce7fdc553afcb4b63c9c3a8ca.zip | |
Merge branch 'win-fix-update-mig'
| -rw-r--r-- | mullvad-daemon/src/migrations/mod.rs | 7 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/cleanup/cleaningops.cpp | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mullvad-daemon/src/migrations/mod.rs b/mullvad-daemon/src/migrations/mod.rs index 8347b3cd76..c1402d15b5 100644 --- a/mullvad-daemon/src/migrations/mod.rs +++ b/mullvad-daemon/src/migrations/mod.rs @@ -174,8 +174,11 @@ mod windows { }; const MIGRATION_DIRNAME: &str = "windows.old"; - const MIGRATE_FILES: [(&str, bool); 2] = - [("settings.json", true), ("account-history.json", false)]; + const MIGRATE_FILES: [(&str, bool); 3] = [ + ("settings.json", true), + ("device.json", true), + ("account-history.json", false), + ]; #[derive(err_derive::Error, Debug)] #[error(no_from)] diff --git a/windows/nsis-plugins/src/cleanup/cleaningops.cpp b/windows/nsis-plugins/src/cleanup/cleaningops.cpp index 3a7ac99abf..2a29e8dd1c 100644 --- a/windows/nsis-plugins/src/cleanup/cleaningops.cpp +++ b/windows/nsis-plugins/src/cleanup/cleaningops.cpp @@ -153,6 +153,7 @@ void MigrateCacheServiceUser() notNamedSet->addObject(L"account-history.json"); notNamedSet->addObject(L"settings.json"); + notNamedSet->addObject(L"device.json"); files.addFilter(std::move(notNamedSet)); files.addFilter(std::make_unique<common::fs::FilterFiles>()); |