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

[source_changes at macosforge.org]

Revision: 876
          http://trac.macosforge.org/projects/darwinbuild/changeset/876
Author:   wsiegrist at apple.com
Date:     2010-09-16 11:22:47 -0700 (Thu, 16 Sep 2010)
Log Message:
-----------
Print the actual path in the error message and clean up message layout.

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

Modified: branches/PR-8416637/darwinup/Depot.cpp
===================================================================
--- branches/PR-8416637/darwinup/Depot.cpp	2010-09-16 18:21:48 UTC (rev 875)
+++ branches/PR-8416637/darwinup/Depot.cpp	2010-09-16 18:22:47 UTC (rev 876)
@@ -481,7 +481,7 @@
 						// otherwise print an error and bail
 						mode_t file_type = file->mode() & S_IFMT;
 						mode_t actual_type = actual->mode() & S_IFMT;
-						fprintf(stderr, FILE_OBJ_CHANGE_ERROR, path, 
+						fprintf(stderr, FILE_OBJ_CHANGE_ERROR, actual->path(), 
 								FILE_TYPE_STRING(file_type),
 								FILE_TYPE_STRING(actual_type));
 						return DEPOT_OBJ_CHANGE;

Modified: branches/PR-8416637/darwinup/File.h
===================================================================
--- branches/PR-8416637/darwinup/File.h	2010-09-16 18:21:48 UTC (rev 875)
+++ branches/PR-8416637/darwinup/File.h	2010-09-16 18:22:47 UTC (rev 876)
@@ -41,8 +41,8 @@
 
 #define FILE_OBJ_CHANGE_ERROR \
 "-----------------------------------------------------------------------------\n" \
-"Darwinup has encountered a potentially unsafe mismatch between the root and  \n" \
-"destination: %s\n" \
+"Potentially unsafe mismatch between the root and destination:  \n\n" \
+"%s\n\n" \
 "You seem to be trying to install a %s over a %s.                             \n" \
 "Darwinup will not install this root by default since it could cause damage   \n" \
 "to your system. You can use the force (-f) option to allow darwinup to       \n" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20100916/db83ba0e/attachment.html>