From a601eaa9e12f36ea05aeea5f2997c76bb591e2ad Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 2 Jun 2013 14:43:02 +0200 Subject: [PATCH] Installer: Remove "/boot/var" directory check The PM Haiku Installer doesn't need support installing ancient Haiku versions. --- src/apps/installer/CopyEngine.cpp | 5 ----- src/apps/installer/InstallerDefs.cpp | 1 - src/apps/installer/InstallerDefs.h | 1 - 3 files changed, 7 deletions(-) diff --git a/src/apps/installer/CopyEngine.cpp b/src/apps/installer/CopyEngine.cpp index 3b58eb9132..8b14883bf5 100644 --- a/src/apps/installer/CopyEngine.cpp +++ b/src/apps/installer/CopyEngine.cpp @@ -507,11 +507,6 @@ CopyEngine::_ShouldCopyEntry(const BEntry& entry, const char* name, const struct stat& statInfo, int32 level) const { if (level == 1 && S_ISDIR(statInfo.st_mode)) { - if (strcmp(kVarDirectoryPath, name) == 0) { - // old location of /boot/var - printf("ignoring '%s'.\n", name); - return false; - } if (strcmp(kPackagesDirectoryPath, name) == 0) { printf("ignoring '%s'.\n", name); return false; diff --git a/src/apps/installer/InstallerDefs.cpp b/src/apps/installer/InstallerDefs.cpp index ae4a55faf3..4e99387398 100644 --- a/src/apps/installer/InstallerDefs.cpp +++ b/src/apps/installer/InstallerDefs.cpp @@ -9,5 +9,4 @@ const char* const kPackagesDirectoryPath = "_packages_"; const char* const kSourcesDirectoryPath = "_sources_"; -const char* const kVarDirectoryPath = "var"; const char* const kSwapFilePath = "common/var/swap"; diff --git a/src/apps/installer/InstallerDefs.h b/src/apps/installer/InstallerDefs.h index 3a16dfaf57..bbc28c5829 100644 --- a/src/apps/installer/InstallerDefs.h +++ b/src/apps/installer/InstallerDefs.h @@ -8,7 +8,6 @@ extern const char* const kPackagesDirectoryPath; extern const char* const kSourcesDirectoryPath; -extern const char* const kVarDirectoryPath; extern const char* const kSwapFilePath;