From 934e233b60a5b1b7ec181852ce43db30e2721151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 25 Mar 2009 20:42:35 +0000 Subject: [PATCH] * don't copy /var (bug #3584) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29707 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/installer/CopyEngine.cpp | 3 ++- src/apps/installer/InstallerWindow.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/apps/installer/CopyEngine.cpp b/src/apps/installer/CopyEngine.cpp index 886d868d6f..33b635561d 100644 --- a/src/apps/installer/CopyEngine.cpp +++ b/src/apps/installer/CopyEngine.cpp @@ -268,7 +268,8 @@ CopyEngine::CopyFolder(BDirectory &srcDir, BDirectory &targetDir) if (S_ISDIR(statbuf.st_mode)) { char name[B_FILE_NAME_LENGTH]; if (entry.GetName(name) == B_OK - && strcmp(name, PACKAGES_DIRECTORY) == 0) { + && (strcmp(name, PACKAGES_DIRECTORY) == 0 + || strcmp(name, VAR_DIRECTORY) == 0)) { continue; } err = FSCopyFolder(&entry, &targetDir, fControl, NULL, false, undo); diff --git a/src/apps/installer/InstallerWindow.h b/src/apps/installer/InstallerWindow.h index 7e372710cd..ecaa862a51 100644 --- a/src/apps/installer/InstallerWindow.h +++ b/src/apps/installer/InstallerWindow.h @@ -31,6 +31,7 @@ const uint32 STATUS_MESSAGE = 'iSTM'; const uint32 INSTALL_FINISHED = 'iIFN'; const uint32 RESET_INSTALL = 'iRSI'; const char PACKAGES_DIRECTORY[] = "_packages_"; +const char VAR_DIRECTORY[] = "var"; class InstallerWindow : public BWindow { public: