darwinup: fix bad return code from update_xpc_services_cache.

git-svn-id: https://svn.macosforge.org/repository/darwinbuild/trunk@1063 10a61168-4876-4dac-953b-31e694342555
macosforge · May 2, 2013 · b993329 · b993329
1 parent d3ea7f7
commit b993329
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,8 @@
 Darwin Build Scripts Change History
 -----------------------------------
+Release 36 [2-May-2013]
+	- darwinup: fix bad return code from update_xpc_services_cache.
+
 Release 35 [24-Apr-2013]
 	- all: fix implicit integer conversions.
 

diff --git a/darwinup/Utils.cpp b/darwinup/Utils.cpp
@@ -389,6 +389,7 @@ int update_xpc_services_cache(const char* path) {
 			res = open(cachepath, O_APPEND | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
 			if (res >= 0) {
 				close(res);
+				res = 0;
 			} else {
 				fprintf(stderr, "Error: (%d) failed to touch cache file.\n", errno);
 				res = errno;

diff --git a/darwinup/main.cpp b/darwinup/main.cpp
@@ -116,7 +116,7 @@ int main(int argc, char* argv[]) {
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
 	while ((ch = getopt(argc, argv, "dfnp:rvh")) != -1) {
 #else
-	while ((ch = getopt(argc, argv, "fnp:vh")) != -1) {		
+	while ((ch = getopt(argc, argv, "dfnp:vh")) != -1) {
 #endif
 		switch (ch) {
 		case 'd':