Fixed logic to detect and warn about changes in the system folder. Merged

the "system" folder and "system folder or it's contents" case.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30057 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2009-04-09 09:30:33 +00:00
parent 000f19e226
commit 080385d599
1 changed files with 2 additions and 8 deletions

View File

@ -471,18 +471,12 @@ ConfirmChangeIfWellKnownDirectory(const BEntry *entry, const char *action,
const char *warning = NULL;
bool requireOverride = true;
if (DirectoryMatches(entry, B_BEOS_DIRECTORY))
warning = "If you %s the system folder, you won't be able to "
"boot " OS_NAME "! Are you sure you want to do this? To %s the folder "
"anyway, hold down the Shift key and click \"Do it\".";
#ifndef __HAIKU__
else if (DirectoryMatchesOrContains(entry, B_BEOS_SYSTEM_DIRECTORY))
if (DirectoryMatchesOrContains(entry, B_BEOS_DIRECTORY)) {
warning = "If you %s the system folder or its contents, you "
"won't be able to boot " OS_NAME "! Are you sure you want to do this? "
"To %s the system folder or its contents anyway, hold down "
"the Shift key and click \"Do it\".";
#endif
else if (DirectoryMatches(entry, B_USER_DIRECTORY)) {
} else if (DirectoryMatches(entry, B_USER_DIRECTORY)) {
warning = "If you %s the home folder, " OS_NAME " may not "
"behave properly! Are you sure you want to do this? "
"To %s the home anyway, click \"Do it\".";