From eb13a353e39799c58dd2a8704e8553ba18a7b1d3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 11 Apr 2013 17:44:58 +0200 Subject: [PATCH] Rename "packages" subdir "config" to "administrative" ... to avoid the impression that it contains something the user can play with. --- headers/private/package/PackagesDirectoryDefs.h | 2 +- src/add-ons/kernel/file_systems/packagefs/Volume.cpp | 2 +- src/servers/package/Volume.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/headers/private/package/PackagesDirectoryDefs.h b/headers/private/package/PackagesDirectoryDefs.h index dacd05b6dd..698f670b0c 100644 --- a/headers/private/package/PackagesDirectoryDefs.h +++ b/headers/private/package/PackagesDirectoryDefs.h @@ -9,7 +9,7 @@ #define _PACKAGE__PRIVATE__PACKAGES_DIRECTORY_DEFS_H_ -#define PACKAGES_DIRECTORY_CONFIG_DIRECTORY "config" +#define PACKAGES_DIRECTORY_ADMIN_DIRECTORY "administrative" #define PACKAGES_DIRECTORY_ACTIVATION_FILE "activated-packages" diff --git a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp index 2e7af7d2e7..426d851f3d 100644 --- a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp @@ -69,7 +69,7 @@ const size_t kMaxActivationRequestSize = 10 * 1024 * 1024; const size_t kMaxActivationFileSize = 10 * 1024 * 1024; static const char* const kActivationFilePath - = PACKAGES_DIRECTORY_CONFIG_DIRECTORY "/" + = PACKAGES_DIRECTORY_ADMIN_DIRECTORY "/" PACKAGES_DIRECTORY_ACTIVATION_FILE; diff --git a/src/servers/package/Volume.cpp b/src/servers/package/Volume.cpp index e4f75d15dc..abc5732f7b 100644 --- a/src/servers/package/Volume.cpp +++ b/src/servers/package/Volume.cpp @@ -40,8 +40,8 @@ using namespace BPackageKit::BPrivate; static const char* const kPackageFileNameExtension = ".hpkg"; -static const char* const kConfigDirectoryName - = PACKAGES_DIRECTORY_CONFIG_DIRECTORY; +static const char* const kAdminDirectoryName + = PACKAGES_DIRECTORY_ADMIN_DIRECTORY; static const char* const kActivationFileName = PACKAGES_DIRECTORY_ACTIVATION_FILE; static const char* const kTemporaryActivationFileName @@ -540,7 +540,7 @@ fPackagesToBeActivated.size(), fPackagesToBeDeactivated.size()); // open and write the temporary file BFile activationFile; BEntry activationFileEntry; - status_t error = _OpenPackagesFile(kConfigDirectoryName, + status_t error = _OpenPackagesFile(kAdminDirectoryName, kTemporaryActivationFileName, B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE, activationFile, &activationFileEntry);