diff options
author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 20:38:10 +0000 |
---|---|---|
committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 20:38:10 +0000 |
commit | 00f6618c63e8246693a3f315c99e3034ec3774aa (patch) | |
tree | 01a64227cd5a9125d71d6a8668950b18afc99de2 /build/mac | |
parent | 60226f128b1175e47ce5154f447a7efa43cc949f (diff) | |
download | chromium_src-00f6618c63e8246693a3f315c99e3034ec3774aa.zip chromium_src-00f6618c63e8246693a3f315c99e3034ec3774aa.tar.gz chromium_src-00f6618c63e8246693a3f315c99e3034ec3774aa.tar.bz2 |
Keystone auto-update support for TestShell
Review URL: http://codereview.chromium.org/18521
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8574 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/mac')
-rwxr-xr-x | build/mac/pkg-dmg | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/mac/pkg-dmg b/build/mac/pkg-dmg index b88fa1e..301d226 100755 --- a/build/mac/pkg-dmg +++ b/build/mac/pkg-dmg @@ -566,7 +566,7 @@ push(@gCleanup, # treated as the volume root itself. rsync will do this by default, if no # trailing '/' is present. With a trailing '/', $sourceFolder becomes # $tempRoot, instead of becoming an entry in $tempRoot. -if(command($gConfig{'cmd_rsync'}, '-a', '--copy-unsafe-links', +if(command($gConfig{'cmd_rsync'}, '-aC', '--copy-unsafe-links', $sourceFolder.($sourceFile?'':'/'),$tempRoot) != 0) { cleanupDie('rsync failed'); } @@ -597,7 +597,7 @@ if($gConfig{'create_directly'}) { } if(defined($iconFile)) { - if(command($gConfig{'cmd_rsync'}, '-a', '--copy-unsafe-links', $iconFile, + if(command($gConfig{'cmd_rsync'}, '-aC', '--copy-unsafe-links', $iconFile, $tempRoot.'/.VolumeIcon.icns') != 0) { cleanupDie('rsync failed for volume icon'); } @@ -897,7 +897,7 @@ sub copyFiles($@) { $success = commandInternal('symlink', $source, $target); } else { - $success = !command($gConfig{'cmd_rsync'}, '-a', '--copy-unsafe-links', + $success = !command($gConfig{'cmd_rsync'}, '-aC', '--copy-unsafe-links', $source, $target); } if(!$success) { @@ -1160,7 +1160,7 @@ sub diskImageMaker($$$$$$$$) { # the volume is mounted, copy the files. --copy-unsafe-links is # unnecessary since it was used to copy everything to the staging # area. There can be no more unsafe links. - if(command($gConfig{'cmd_rsync'}, '-a', + if(command($gConfig{'cmd_rsync'}, '-aC', $source.'/',$partitionMountPoint) != 0) { cleanupDie('rsync to new volume failed'); } |