diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 19:09:59 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 19:09:59 +0000 |
| commit | d50ec48c066f8933357da543ae3b93ab3c983759 (patch) | |
| tree | ed7c9f83bde70b25d3e9a3b1a479762416c11381 /chrome/installer/mac | |
| parent | 07c71b1872598f1fcc6183d73aca1642ac2b80c9 (diff) | |
| download | chromium_src-d50ec48c066f8933357da543ae3b93ab3c983759.zip chromium_src-d50ec48c066f8933357da543ae3b93ab3c983759.tar.gz chromium_src-d50ec48c066f8933357da543ae3b93ab3c983759.tar.bz2 | |
Stupid fixes
BUG=45017
TEST=none
Review URL: http://codereview.chromium.org/2765008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mac')
| -rwxr-xr-x | chrome/installer/mac/dirdiffer.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/installer/mac/dirdiffer.sh b/chrome/installer/mac/dirdiffer.sh index 8eb0f49..ffac1d1b 100755 --- a/chrome/installer/mac/dirdiffer.sh +++ b/chrome/installer/mac/dirdiffer.sh @@ -82,7 +82,7 @@ # 15 Verification failed # 16 Could not set mode (permissions) # 17 Could not set modification time -# 18 Invalid regular expression +# 18 Invalid regular expression (irregular expression?) set -eu @@ -361,9 +361,8 @@ verify_patch_dir() { # rsync will print a line for any file, directory, or symbolic link that # differs or exists only in one directory. As used here, it correctly # considers link targets, file contents, permissions, and timestamps. - local rsync_output - rsync_command=(rsync -clprt --delete --out-format=%n \ - "${new_dir}/" "${verify_dir}") + local rsync_command=(rsync -clprt --delete --out-format=%n \ + "${new_dir}/" "${verify_dir}") if [[ ${#g_verify_exclude[@]} -gt 0 ]]; then local exclude for exclude in "${g_verify_exclude[@]}"; do @@ -375,6 +374,7 @@ verify_patch_dir() { done fi + local rsync_output if ! rsync_output="$("${rsync_command[@]}")"; then err "rsync for verification failed" exit 15 |