Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Installer should merge directories and replace files

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16548 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2006-02-28 16:08:49 +00:00
parent f764a491bb
commit 63beb9cd39
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/apps/installer/InstallerCopyLoopControl.cpp
View File

@ -57,7 +57,10 @@ InstallerCopyLoopControl::OverwriteOnConflict(const BEntry *srcEntry,
const char *destName, const BDirectory *destDir, bool srcIsDir,
bool dstIsDir)
{
return kReplace;
if (srcIsDir && dstIsDir)
return kMerge;
else
return kReplace;
}