openstack/devstack
Code Issues Proposed changes

Merge "upload_image.sh should parse filenames correctly"

Browse Source
This commit is contained in:
Jenkins 2014-01-26 02:33:34 +00:00 committed by Gerrit Code Review
commit 58cc03629f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions
View File

@ -1542,7 +1542,7 @@ function upload_image() {
# NOTE: For backwards compatibility reasons, colons may be used in place
# of semi-colons for property delimiters but they are not permitted
# characters in NTFS filesystems.
property_string=`echo "$IMAGE_NAME" | grep -oP '(?<=-)(?!.*-).+[:;].+[:;].+$'`
property_string=`echo "$IMAGE_NAME" | grep -oP '(?<=-)(?!.*-).*[:;].*[:;].*$'`
IFS=':;' read -a props <<< "$property_string"
vmdk_disktype="${props[0]:-$vmdk_disktype}"
vmdk_adapter_type="${props[1]:-$vmdk_adapter_type}"