Author: brane
Date: Wed Nov 12 11:51:10 2014
New Revision: 1638766
URL: http://svn.apache.org/r1638766
Log:
Make the OSX buildbot ramdisk scripts safer.
[in tools/buildbot/slaves/svn-x64-macosx]
* mkramdisk.sh, rmramdisk.sh: Check if the volume mountpoint exists.
This prevents unintended side effects if one builder name is
a prefix of another.
Modified:
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/rmramdisk.sh
Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh?rev=1638766&r1=1638765&r2=1638766&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh
(original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh Wed Nov
12 11:51:10 2014
@@ -28,11 +28,13 @@ fi
volume="/Volumes/$1"
mount | fgrep "${volume}" >/dev/null || {
- # Make sure we strip trailing spaces from the result of older
- # versions of hduitil.
- device=$(echo $(hdiutil attach -nomount ram://1200000))
- newfs_hfs -M 0700 -v "$1" "${device}"
- hdiutil mountvol "${device}"
+ test -e "${volume}" || {
+ # Make sure we strip trailing spaces from the result of older
+ # versions of hduitil.
+ device=$(echo $(hdiutil attach -nomount ram://1000000))
+ newfs_hfs -M 0700 -v "$1" "${device}"
+ hdiutil mountvol "${device}"
+ }
}
exit 0
Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/rmramdisk.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/rmramdisk.sh?rev=1638766&r1=1638765&r2=1638766&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/rmramdisk.sh
(original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/rmramdisk.sh Wed Nov
12 11:51:10 2014
@@ -28,7 +28,7 @@ fi
volume="/Volumes/$1"
mount | fgrep "${volume}" >/dev/null && {
- hdiutil detach "${volume}" -force
+ test -e "${volume}" && hdiutil detach "${volume}" -force
}
exit 0
