Merge lp:~jontai/openvista-gtm-integration/bug458314 into lp:openvista-gtm-integration

[Jon Tai]

[jeff.apple (jeff-apple)]

Loooks fine, at least as well as I understand the problem. We are losing the implicit -t option to rsync. Is that OK?

review: Approve

[Jon Tai (jontai)]

> Loooks fine, at least as well as I understand the problem. We are losing the
> implicit -t option to rsync. Is that OK?

The actual copy is done with "cp -a", which should preserve the permissions and timestamps. The rsync is just a check. With -rl, rsync still checks timestamps, but if were to do a copy, it would use the transfer time, whereas with -t (or -a, which includes -t), it would use the source file's timestamp.

I'm going to merge.

=== modified file 'scripts/usr/bin/ovbackup'
--- scripts/usr/bin/ovbackup	2009-08-11 20:47:56 +0000
+++ scripts/usr/bin/ovbackup	2009-10-22 16:40:22 +0000
@@ -165,7 +165,7 @@
 #
 # FIXME: if the routines did change, we should probably try again instead of
 # just aborting - rsync the routines, then re-run the database backup
-output=`rsync -ai --delete --dry-run "$root/$instance/routines/" "$tempdir/routines/"`
+output=`rsync -rli --delete --dry-run "$root/$instance/routines/" "$tempdir/routines/"`
 [ -z "$output" ] || exit_with_error "ovbackup" "Routines changed during backup"
 
 # if we get here, that means that the routines haven't changed, and either the