* Fixed problems when installing onto non-empty target volumes. The
'system' folder will be a clean copy of the source volume. Other folders will be merged (as before), but in case a folder is in the way of a link or file from the source volume, it will now be purged. * Clarified the alert for non-empty target volumes, so it is very clear what happens. (Maybe there ought to the be option to only copy the system folder, though.) * Fixed a problem with copying attributes in certain cases. * Fixed the main GUI not resetting state properly after encountering an error during the copy process. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31042 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
f664c6474b
commit
f76e944e24
@ -263,8 +263,11 @@ CopyEngine::_CopyFolder(const char* _source, const char* _destination,
|
||||
return ret;
|
||||
|
||||
ret = create_directory(_destination, 0777);
|
||||
if (ret < B_OK && ret != B_FILE_EXISTS)
|
||||
if (ret < B_OK && ret != B_FILE_EXISTS) {
|
||||
fprintf(stderr, "Could not create '%s': %s\n", _destination,
|
||||
strerror(ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
BDirectory destination(_destination);
|
||||
ret = destination.InitCheck();
|
||||
@ -301,11 +304,25 @@ CopyEngine::_CopyFolder(const char* _source, const char* _destination,
|
||||
// handle recursive directory copy
|
||||
|
||||
if (copy.Exists()) {
|
||||
ret = B_OK;
|
||||
if (copy.IsDirectory()) {
|
||||
if (_ShouldClobberFolder(name, statInfo, level))
|
||||
ret = _RemoveFolder(copy);
|
||||
else {
|
||||
// Do not overwrite attributes on folders that exist.
|
||||
// This should work better when the install target already
|
||||
// contains a Haiku installation.
|
||||
// This should work better when the install target
|
||||
// already contains a Haiku installation.
|
||||
copyAttributes = false;
|
||||
}
|
||||
} else
|
||||
ret = copy.Remove();
|
||||
|
||||
if (ret != B_OK) {
|
||||
fprintf(stderr, "Failed to make room for folder '%s': "
|
||||
"%s\n", name, strerror(ret));
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
BPath srcFolder;
|
||||
ret = entry.GetPath(&srcFolder);
|
||||
@ -329,7 +346,19 @@ CopyEngine::_CopyFolder(const char* _source, const char* _destination,
|
||||
// We are supposed to quit
|
||||
return B_CANCELED;
|
||||
}
|
||||
} else if (S_ISLNK(statInfo.st_mode)) {
|
||||
} else {
|
||||
if (copy.Exists()) {
|
||||
if (copy.IsDirectory())
|
||||
ret = _RemoveFolder(copy);
|
||||
else
|
||||
ret = copy.Remove();
|
||||
if (ret != B_OK) {
|
||||
fprintf(stderr, "Failed to make room for entry '%s': "
|
||||
"%s\n", name, strerror(ret));
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
if (S_ISLNK(statInfo.st_mode)) {
|
||||
// copy symbolic links
|
||||
BSymLink srcLink(&entry);
|
||||
if (ret < B_OK)
|
||||
@ -354,10 +383,15 @@ CopyEngine::_CopyFolder(const char* _source, const char* _destination,
|
||||
if (ret < B_OK)
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
if (!copyAttributes)
|
||||
continue;
|
||||
|
||||
ret = copy.SetTo(&destination, name);
|
||||
if (ret != B_OK)
|
||||
return ret;
|
||||
|
||||
// copy attributes
|
||||
BNode sourceNode(&entry);
|
||||
BNode targetNode(©);
|
||||
@ -396,6 +430,30 @@ CopyEngine::_CopyFolder(const char* _source, const char* _destination,
|
||||
}
|
||||
|
||||
|
||||
status_t
|
||||
CopyEngine::_RemoveFolder(BEntry& entry)
|
||||
{
|
||||
BDirectory directory(&entry);
|
||||
status_t ret = directory.InitCheck();
|
||||
if (ret != B_OK)
|
||||
return ret;
|
||||
|
||||
BEntry subEntry;
|
||||
while (directory.GetNextEntry(&subEntry) == B_OK) {
|
||||
if (subEntry.IsDirectory()) {
|
||||
ret = _RemoveFolder(subEntry);
|
||||
if (ret != B_OK)
|
||||
return ret;
|
||||
} else {
|
||||
ret = subEntry.Remove();
|
||||
if (ret != B_OK)
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
return entry.Remove();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
CopyEngine::_UpdateProgress()
|
||||
{
|
||||
@ -430,6 +488,24 @@ CopyEngine::_ShouldCopyEntry(const char* name, const struct stat& statInfo,
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
CopyEngine::_ShouldClobberFolder(const char* name, const struct stat& statInfo,
|
||||
int32 level) const
|
||||
{
|
||||
if (level == 1 && S_ISDIR(statInfo.st_mode)) {
|
||||
if (strcmp("system", name) == 0) {
|
||||
printf("clobbering '%s'.\n", name);
|
||||
return true;
|
||||
}
|
||||
// if (strcmp("develop", name) == 0) {
|
||||
// printf("clobbering '%s'.\n", name);
|
||||
// return true;
|
||||
// }
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
int32
|
||||
CopyEngine::_WriteThreadEntry(void* cookie)
|
||||
{
|
||||
|
@ -48,6 +48,12 @@ private:
|
||||
const struct stat& statInfo,
|
||||
int32 level) const;
|
||||
|
||||
bool _ShouldClobberFolder(const char* name,
|
||||
const struct stat& statInfo,
|
||||
int32 level) const;
|
||||
|
||||
status_t _RemoveFolder(BEntry& entry);
|
||||
|
||||
void _UpdateProgress();
|
||||
|
||||
static int32 _WriteThreadEntry(void* cookie);
|
||||
|
@ -373,15 +373,12 @@ InstallerWindow::MessageReceived(BMessage *msg)
|
||||
(new BAlert("error", errorMessage, "Ok"))->Go();
|
||||
}
|
||||
|
||||
fInstallStatus = kReadyForInstall;
|
||||
fBeginButton->SetEnabled(true);
|
||||
_DisableInterface(false);
|
||||
|
||||
fProgressLayoutItem->SetVisible(false);
|
||||
fPkgSwitchLayoutItem->SetVisible(true);
|
||||
_ShowOptionalPackages();
|
||||
|
||||
fBeginButton->SetLabel("Begin");
|
||||
_UpdateControls();
|
||||
break;
|
||||
}
|
||||
case START_SCAN:
|
||||
|
@ -381,7 +381,12 @@ WorkerThread::_PerformInstall(BMenu *srcMenu, BMenu *targetMenu)
|
||||
}
|
||||
if (entries != 0
|
||||
&& ((new BAlert("", "The target volume is not empty. Are you sure you "
|
||||
"want to install anyway?", "Install Anyway", "Cancel", 0,
|
||||
"want to install anyway?\n\nNote: The 'system' folder will be a "
|
||||
"clean copy from the source volume, all other folders will be "
|
||||
"merged, whereas files and links that exist on both the source "
|
||||
"and target volume will be overwritten with the source volume "
|
||||
"version.",
|
||||
"Install Anyway", "Cancel", 0,
|
||||
B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0)) {
|
||||
err = B_CANCELED;
|
||||
goto error;
|
||||
|
Loading…
Reference in New Issue
Block a user