From 8406e92795b8cfce52651ec663aece6b451740aa Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 4 Dec 2006 10:06:11 +0100 Subject: [PATCH] install.c: Preserve time stamps before changing owner or file mode bits, for consistency with other coreutils programs. --- ChangeLog | 6 ++++++ src/install.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fa9809..551668c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-03 Paul Eggert + + * src/install.c (install_file_in_file): Preserve time stamps + before changing owner or file mode bits, for consistency with + other coreutils programs. + 2006-12-03 Jim Meyering * tests/misc/date-sec: Output a fixed string. diff --git a/src/install.c b/src/install.c index 1ccc774..a5d832f 100644 --- a/src/install.c +++ b/src/install.c @@ -459,11 +459,10 @@ install_file_in_file (const char *from, const char *to, return false; if (strip_files) strip (to); - if (! change_attributes (to)) + if (x->preserve_timestamps && (strip_files || ! S_ISREG (from_sb.st_mode)) + && ! change_timestamps (&from_sb, to)) return false; - if (x->preserve_timestamps && (strip_files || ! S_ISREG (from_sb.st_mode))) - return change_timestamps (&from_sb, to); - return true; + return change_attributes (to); } /* Copy file FROM into directory TO_DIR, keeping its same name, -- 2.7.4