From 071b36fd9068a202a0e55910e02cc0410df21d0b Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Fri, 21 Jun 2002 12:10:02 +0000
Subject: Change all `preserving ...' diagnostics to `failed to preserve ...'
 to make the failure clearer.

---
 src/copy.c | 9 ++++++---
 src/cp.c   | 7 ++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/copy.c b/src/copy.c
index 8df19ce9e..ed71e5eb2 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -1444,7 +1444,8 @@ copy_internal (const char *src_path, const char *dst_path,
 # if HAVE_LCHOWN
 	  if (DO_CHOWN (lchown, dst_path, src_sb.st_uid, src_sb.st_gid))
 	    {
-	      error (0, errno, _("preserving ownership for %s"), dst_path);
+	      error (0, errno, _("failed to preserve ownership for %s"),
+		     dst_path);
 	      goto un_backup;
 	    }
 # else
@@ -1506,7 +1507,8 @@ copy_internal (const char *src_path, const char *dst_path,
       ran_chown = 1;
       if (DO_CHOWN (chown, dst_path, src_sb.st_uid, src_sb.st_gid))
 	{
-	  error (0, errno, _("preserving ownership for %s"), quote (dst_path));
+	  error (0, errno, _("failed to preserve ownership for %s"),
+		 quote (dst_path));
 	  if (x->require_preserve)
 	    return 1;
 	}
@@ -1517,7 +1519,8 @@ copy_internal (const char *src_path, const char *dst_path,
   {
     file_t file = getdport (dst_path);
     if (file_chauthor (file, src_sb.st_author))
-      error (0, errno, _("preserving authorship for %s"), quote (dst_path));
+      error (0, errno, _("failed to preserve authorship for %s"),
+	     quote (dst_path));
     mach_port_deallocate (mach_task_self (), file);
   }
 #endif
diff --git a/src/cp.c b/src/cp.c
index 4440a983e..41fe2b247 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -322,7 +322,8 @@ re_protect (const char *const_dst_path, int src_offset,
 
 	  if (utime (dst_path, &utb))
 	    {
-	      error (0, errno, _("preserving times for %s"), quote (dst_path));
+	      error (0, errno, _("failed to preserve times for %s"),
+		     quote (dst_path));
 	      return 1;
 	    }
 	}
@@ -335,7 +336,7 @@ re_protect (const char *const_dst_path, int src_offset,
 	  if (chown (dst_path, src_sb.st_uid, src_sb.st_gid)
 	      && ((errno != EPERM && errno != EINVAL) || myeuid == 0))
 	    {
-	      error (0, errno, _("preserving ownership for %s"),
+	      error (0, errno, _("failed to preserve ownership for %s"),
 		     quote (dst_path));
 	      return 1;
 	    }
@@ -345,7 +346,7 @@ re_protect (const char *const_dst_path, int src_offset,
 	{
 	  if (chmod (dst_path, src_sb.st_mode & x->umask_kill))
 	    {
-	      error (0, errno, _("preserving permissions for %s"),
+	      error (0, errno, _("failed to preserve permissions for %s"),
 		     quote (dst_path));
 	      return 1;
 	    }
-- 
cgit v1.2.3-54-g00ecf