i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* don't copy /var (bug #3584)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29707 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2009-03-25 20:42:35 +00:00
parent 3c394ad89e
commit 934e233b60
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/installer/CopyEngine.cpp
+2 -1
View File
@@ -268,7 +268,8 @@ CopyEngine::CopyFolder(BDirectory &srcDir, BDirectory &targetDir)
if (S_ISDIR(statbuf.st_mode)) { if (S_ISDIR(statbuf.st_mode)) {
char name[B_FILE_NAME_LENGTH]; char name[B_FILE_NAME_LENGTH];
if (entry.GetName(name) == B_OK if (entry.GetName(name) == B_OK
&& strcmp(name, PACKAGES_DIRECTORY) == 0) { && (strcmp(name, PACKAGES_DIRECTORY) == 0
|| strcmp(name, VAR_DIRECTORY) == 0)) {
continue; continue;
} }
err = FSCopyFolder(&entry, &targetDir, fControl, NULL, false, undo); err = FSCopyFolder(&entry, &targetDir, fControl, NULL, false, undo);
src/apps/installer/InstallerWindow.h
+1
View File
@@ -31,6 +31,7 @@ const uint32 STATUS_MESSAGE = 'iSTM';
const uint32 INSTALL_FINISHED = 'iIFN'; const uint32 INSTALL_FINISHED = 'iIFN';
const uint32 RESET_INSTALL = 'iRSI'; const uint32 RESET_INSTALL = 'iRSI';
const char PACKAGES_DIRECTORY[] = "_packages_"; const char PACKAGES_DIRECTORY[] = "_packages_";
const char VAR_DIRECTORY[] = "var";
class InstallerWindow : public BWindow { class InstallerWindow : public BWindow {
public: public: