diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 16:32:16 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 16:32:16 +0000 |
| commit | 118512e04653b4e4a18a12270a63269063f33c74 (patch) | |
| tree | 1ec8c33b8fbc956bc82a6cf28fa66994e0ff871d /chrome/tools | |
| parent | dc76e836720fd8d9a3943d75f3b17dd18ed4003d (diff) | |
| download | chromium_src-118512e04653b4e4a18a12270a63269063f33c74.zip chromium_src-118512e04653b4e4a18a12270a63269063f33c74.tar.gz chromium_src-118512e04653b4e4a18a12270a63269063f33c74.tar.bz2 | |
Allow hdiutil makehybrid -hfs-openfolder to be disabled by the existing
openfolder_bless configuration parameter.
Disk images containing dirpatcher/goobsdiff updates should rarely fall
directly into users' hands, but when they do, they don't need to open
anything when they're mounted.
BUG=45017
TEST=none
Review URL: http://codereview.chromium.org/2762015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rwxr-xr-x | chrome/tools/build/mac/pkg-dmg | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/tools/build/mac/pkg-dmg b/chrome/tools/build/mac/pkg-dmg index 32df18e..7ec117d 100755 --- a/chrome/tools/build/mac/pkg-dmg +++ b/chrome/tools/build/mac/pkg-dmg @@ -931,8 +931,9 @@ sub diskImageMaker($$$$$$$$) { $hybridImage = giveExtension($tempDir.'/hybrid', '.dmg'); if(command($gConfig{'cmd_hdiutil'}, 'makehybrid', '-hfs', - '-hfs-volume-name', $name, '-hfs-openfolder', $source, '-ov', - $source, '-o', $hybridImage) != 0) { + '-hfs-volume-name', $name, + ($gConfig{'openfolder_bless'} ? ('-hfs-openfolder', $source) : ()), + '-ov', $source, '-o', $hybridImage) != 0) { cleanupDie('hdiutil makehybrid failed'); } |