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

Rename "packages" subdir "config" to "administrative"

Browse Source 
... to avoid the impression that it contains something the user can
play with.
This commit is contained in:
Ingo Weinhold
2013-04-11 17:44:58 +02:00
parent dd46d98163
commit eb13a353e3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/package/PackagesDirectoryDefs.h
+1 -1
View File
@@ -9,7 +9,7 @@
#define _PACKAGE__PRIVATE__PACKAGES_DIRECTORY_DEFS_H_ #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" #define PACKAGES_DIRECTORY_ACTIVATION_FILE "activated-packages"
src/add-ons/kernel/file_systems/packagefs/Volume.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ const size_t kMaxActivationRequestSize = 10 * 1024 * 1024;
const size_t kMaxActivationFileSize = 10 * 1024 * 1024; const size_t kMaxActivationFileSize = 10 * 1024 * 1024;
static const char* const kActivationFilePath static const char* const kActivationFilePath
= PACKAGES_DIRECTORY_CONFIG_DIRECTORY "/" = PACKAGES_DIRECTORY_ADMIN_DIRECTORY "/"
PACKAGES_DIRECTORY_ACTIVATION_FILE; PACKAGES_DIRECTORY_ACTIVATION_FILE;
src/servers/package/Volume.cpp
+3 -3
View File
@@ -40,8 +40,8 @@ using namespace BPackageKit::BPrivate;
static const char* const kPackageFileNameExtension = ".hpkg"; static const char* const kPackageFileNameExtension = ".hpkg";
static const char* const kConfigDirectoryName static const char* const kAdminDirectoryName
= PACKAGES_DIRECTORY_CONFIG_DIRECTORY; = PACKAGES_DIRECTORY_ADMIN_DIRECTORY;
static const char* const kActivationFileName static const char* const kActivationFileName
= PACKAGES_DIRECTORY_ACTIVATION_FILE; = PACKAGES_DIRECTORY_ACTIVATION_FILE;
static const char* const kTemporaryActivationFileName static const char* const kTemporaryActivationFileName
@@ -540,7 +540,7 @@ fPackagesToBeActivated.size(), fPackagesToBeDeactivated.size());
// open and write the temporary file // open and write the temporary file
BFile activationFile; BFile activationFile;
BEntry activationFileEntry; BEntry activationFileEntry;
status_t error = _OpenPackagesFile(kConfigDirectoryName, status_t error = _OpenPackagesFile(kAdminDirectoryName,
kTemporaryActivationFileName, kTemporaryActivationFileName,
B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE, activationFile, B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE, activationFile,
&activationFileEntry); &activationFileEntry);