hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'develop' into next

Browse Source
This commit is contained in:
Sebastian Messmer 2016-09-25 11:41:33 +02:00
commit 58d6a454d7
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cryfs-cli/Cli.cpp
View File

@ -97,10 +97,12 @@ namespace cryfs {
cout << "WARNING! This is a debug build. Performance might be slow." << endl;
#endif
#ifndef CRYFS_NO_UPDATE_CHECKS
if (!Environment::noUpdateCheck()) {
_checkForUpdates();
} else {
if (Environment::noUpdateCheck()) {
cout << "Automatic checking for security vulnerabilities and updates is disabled." << endl;
} else if (Environment::isNoninteractive()) {
cout << "Automatic checking for security vulnerabilities and updates is disabled in noninteractive mode." << endl;
} else {
_checkForUpdates();
}
#else
# warning Update checks are disabled. The resulting executable will not go online to check for newer versions or known security vulnerabilities.

4
test/cryfs/config/CryConfigLoaderTest.cpp
View File

@ -249,7 +249,7 @@ TEST_F(CryConfigLoaderTest, AsksWhenLoadingNewerFilesystem_AnswerNo) {
Load();
EXPECT_TRUE(false); // expect throw
} catch (const std::runtime_error &e) {
EXPECT_THAT(e.what(), HasSubstr("It has to be migrated."));
EXPECT_THAT(e.what(), HasSubstr("Please update your CryFS version."));
}
}
@ -277,7 +277,7 @@ TEST_F(CryConfigLoaderTest, DontMigrateWhenAnsweredNo) {
Load();
EXPECT_TRUE(false); // expect throw
} catch (const std::runtime_error &e) {
EXPECT_THAT(e.what(), HasSubstr("Please update your CryFS version."));
EXPECT_THAT(e.what(), HasSubstr("It has to be migrated."));
}
}