[darwinbuild-changes] [878] branches/PR-8416637/darwinup

[source_changes at macosforge.org]

Revision: 878
          http://trac.macosforge.org/projects/darwinbuild/changeset/878
Author:   wsiegrist at apple.com
Date:     2010-09-16 14:19:29 -0700 (Thu, 16 Sep 2010)
Log Message:
-----------
Force force mode for uninstall so we can uninstall roots installed with force mode on.

Modified Paths:
--------------
    branches/PR-8416637/darwinup/File.cpp
    branches/PR-8416637/darwinup/main.cpp

Modified: branches/PR-8416637/darwinup/File.cpp
===================================================================
--- branches/PR-8416637/darwinup/File.cpp	2010-09-16 21:18:51 UTC (rev 877)
+++ branches/PR-8416637/darwinup/File.cpp	2010-09-16 21:19:29 UTC (rev 878)
@@ -212,9 +212,6 @@
 				fprintf(stderr, "%s:%d: %s: %s (%d)\n", 
 						__FILE__, __LINE__, dstpath, strerror(errno), errno);
 			} else {
-				if (!force) {
-					assert(0);
-				} 
 				fprintf(stderr, "%s:%d: %s: %s (%d)\n", 
 						__FILE__, __LINE__, dstpath, strerror(errno), errno);
 				fprintf(stderr, "ERROR: fatal error during File::install. " \

Modified: branches/PR-8416637/darwinup/main.cpp
===================================================================
--- branches/PR-8416637/darwinup/main.cpp	2010-09-16 21:18:51 UTC (rev 877)
+++ branches/PR-8416637/darwinup/main.cpp	2010-09-16 21:19:29 UTC (rev 878)
@@ -229,6 +229,10 @@
 				res = depot->process_archive(argv[0], argv[i]);
 			} else if (strcmp(argv[0], "uninstall") == 0) {
 				if (i==1 && depot->initialize(true)) exit(15);
+				// uninstall is always in force mode so it can
+				// uninstall archives that were installed under
+				// force mode
+				force = 1;
 				res = depot->process_archive(argv[0], argv[i]);
 			} else if (strcmp(argv[0], "verify") == 0) {
 				if (i==1 && depot->initialize(true)) exit(16);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20100916/fd307c41/attachment.html>