Permalink
Browse files

Merge pull request #240 from ctgswallow/master

Issue #234: Do not check utime on a copied symlink
  • Loading branch information...
2 parents e93535b + 1e5357c commit 53493749e8e5a303216822871d4ed9ed21c4e5c9 @jordansissel committed Jul 10, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 lib/fpm/package/dir.rb
View
@@ -125,7 +125,8 @@ def copy_metadata(source, destination)
dest_stat = File::lstat(destination)
# If this is a hard-link, there's no metadata to copy.
- return if source_stat.ino == dest_stat.ino
+ # If this is a symlink, what it points to hasn't been copied yet.
+ return if source_stat.ino == dest_stat.ino || File.symlink?(destination)
File.utime(source_stat.atime, source_stat.mtime, destination)
begin

0 comments on commit 5349374

Please sign in to comment.