[haiku-commits] BRANCH HaikuPM-github.package-management [3b5cb32] in src: bin system/libroot/os
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 24 Apr 2013 15:15:31 +0200 (CEST)
added 2 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: 3f85cfc1322254c2be3b8ef4aa54ea39616e91ed
new head: 3b5cb3253307909f6bf5a6b29c3d2f081008ac62
overview: https://github.com/haiku/HaikuPM/compare/3f85cfc...3b5cb32
----------------------------------------------------------------------------
f7d5bd4: finddir: Print more useful message in error case
3b5cb32: find_directory(): Actually handle the new constants
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 6 insertions(+), 3 deletions(-)
src/bin/finddir.c | 5 ++---
src/system/libroot/os/find_directory.cpp | 4 ++++
############################################################################
Commit: f7d5bd46d78af12f42fd9bd7c524eda17ce17dc4
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Apr 24 13:10:55 2013 UTC
finddir: Print more useful message in error case
----------------------------------------------------------------------------
diff --git a/src/bin/finddir.c b/src/bin/finddir.c
index d578ddd..4c8a16e 100644
--- a/src/bin/finddir.c
+++ b/src/bin/finddir.c
@@ -249,9 +249,8 @@ main(int argc, char *argv[])
if (result == B_OK) {
printf("%s\n", buffer);
} else {
- /* else what? */
- /* this can not happen! */
- fprintf(stderr, "Serious internal error; contact
support\n");
+ fprintf(stderr, "Failed to get directory: %s\n",
strerror(result));
+ return 1;
}
}
############################################################################
Commit: 3b5cb3253307909f6bf5a6b29c3d2f081008ac62
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Apr 24 13:11:16 2013 UTC
find_directory(): Actually handle the new constants
----------------------------------------------------------------------------
diff --git a/src/system/libroot/os/find_directory.cpp
b/src/system/libroot/os/find_directory.cpp
index 7556f29..b3ec646 100644
--- a/src/system/libroot/os/find_directory.cpp
+++ b/src/system/libroot/os/find_directory.cpp
@@ -308,6 +308,7 @@ find_directory(directory_which which, dev_t device, bool
createIt,
case B_COMMON_NONPACKAGED_DOCUMENTATION_DIRECTORY:
case B_COMMON_NONPACKAGED_LIB_DIRECTORY:
case B_COMMON_NONPACKAGED_HEADERS_DIRECTORY:
+ case B_COMMON_NONPACKAGED_DEVELOP_DIRECTORY:
templatePath = kCommonDirectories[which -
B_COMMON_DIRECTORY];
break;
@@ -328,6 +329,8 @@ find_directory(directory_which which, dev_t device, bool
createIt,
case B_USER_CACHE_DIRECTORY:
case B_USER_PACKAGES_DIRECTORY:
case B_USER_HEADERS_DIRECTORY:
+ case B_USER_DEVELOP_DIRECTORY:
+ case B_USER_DOCUMENTATION_DIRECTORY:
case B_USER_NONPACKAGED_DIRECTORY:
case B_USER_NONPACKAGED_ADDONS_DIRECTORY:
case B_USER_NONPACKAGED_TRANSLATORS_DIRECTORY:
@@ -339,6 +342,7 @@ find_directory(directory_which which, dev_t device, bool
createIt,
case B_USER_NONPACKAGED_DOCUMENTATION_DIRECTORY:
case B_USER_NONPACKAGED_LIB_DIRECTORY:
case B_USER_NONPACKAGED_HEADERS_DIRECTORY:
+ case B_USER_NONPACKAGED_DEVELOP_DIRECTORY:
templatePath = kUserDirectories[which -
B_USER_DIRECTORY];
break;
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management [3b5cb32] in src: bin system/libroot/os - HaikuPM-github . package-management
