Keystone auto-update support for TestShell
Review URL: http://codereview.chromium.org/18521 git-svn-id: http://src.chromium.org/svn/trunk/src/build@8574 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
d39643985b
Коммит
68b6d323e6
|
@ -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');
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче