Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix winget after a call to winget settings export #2767

Merged
merged 8 commits into from
Dec 15, 2022
Merged

Fix winget after a call to winget settings export #2767

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e20612e
Fix
msftrubengu Dec 14, 2022
619b387
trycatch
msftrubengu Dec 14, 2022
a7b1363
Core
msftrubengu Dec 14, 2022
342f32a
Logging
msftrubengu Dec 14, 2022
8de55f3
Add a way to not print user settings warning
msftrubengu Dec 15, 2022
84b86f2
Merge remote-tracking branch 'upstream/master' into fix
msftrubengu Dec 15, 2022
fda6d66
...
msftrubengu Dec 15, 2022
030cf63
semicolon
msftrubengu Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/AppInstallerCommonCore/UserSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ namespace AppInstaller::Settings
}
catch (const std::exception& e)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This exposes the scenario where both the normal and backup settings fail, which can result in no output to the user about settings load failure? I think it just means an else for when the backup settings fails to load (~line 520 now) where we put in a different warning about not being able to load any settings file.

{
AICLI_LOG(Core, Error, << "Failed to read settings.json file. Reason: " << e.what());
AICLI_LOG(Core, Error, << "Failed to read " << setting.Name << "Reason: " << e.what());
}
catch (...)
{
AICLI_LOG(Core, Error, << "Failed to read settings.json file.. Reason unknown.");
AICLI_LOG(Core, Error, << "Failed to read " << setting.Name << " Reason unknown.");
}

return {};
Expand Down Expand Up @@ -518,6 +518,10 @@ namespace AppInstaller::Settings
m_type = UserSettingsType::Backup;
settingsRoot = settingsBackupJson.value();
}
else
{
AICLI_LOG(Core, Warning, << "Failed loading settings files.");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking more along the lines of the user visible portion (without opening the log file). So a new:

m_warnings.emplace_back(StringResource::String::SettingsWarningWhoopsSettingsDidntLoad);

That would then at least warn the user "Hey, we couldn't load any settings, so you are getting the default behavior".

}
}
}

Expand Down