openstack/devstack
Code Issues Proposed changes

bash8: fix bash8 warning

Browse Source 
This patch removes the following bash8 warnings.

> /devstack/ $ ./run_tests.sh
> Running bash8...
> E003: Indent not multiple of 4: '             wget -c $image_url -O $FILES/$IMAGE_FNAME'
>  - functions: L1367
> E003: Indent not multiple of 4: '             if [[ $? -ne 0 ]]; then'
>  - functions: L1368
> E003: Indent not multiple of 4: '                 echo "Not found: $image_url"'
>  - functions: L1369
> E003: Indent not multiple of 4: '                 return'
>  - functions: L1370
> E003: Indent not multiple of 4: '             fi'
>  - functions: L1371
> E003: Indent not multiple of 4: '                                 `"should use a descriptor-data pair."'
>  - functions: L1423
> E003: Indent not multiple of 4: '                         `" Attempt to retrieve the *-flat.vmdk: $flat_url"'
>  - functions: L1438
> E003: Indent not multiple of 4: '                             `" Attempt to retrieve the descriptor *.vmdk: $descriptor_url"'
>  - functions: L1477
> E003: Indent not multiple of 4: '                         warn $LINENO "Descriptor not found $descriptor_url"'
>  - functions: L1492
> E003: Indent not multiple of 4: '                         descriptor_found=false'
>  - functions: L1493
> E003: Indent not multiple of 4: '                 fi'
>  - functions: L1501
> E003: Indent not multiple of 4: '             fi'
>  - functions: L1502
> E003: Indent not multiple of 4: '             #TODO(alegendre): handle streamOptimized once supported by the VMware driver.'
>  - functions: L1503
> E003: Indent not multiple of 4: '             vmdk_disktype="preallocated"'
>  - functions: L1504
> 14 bash8 error(s) found

Change-Id: Icf2cddf283192a50253ccfa697c2d32eec75b4ba
Closes-Bug: #1267716
This commit is contained in:
Isaku Yamahata 2014-01-10 15:28:29 +09:00
parent bd49958794
commit 6681a4fae9
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
functions
View File

@ -1364,11 +1364,11 @@ function upload_image() {
if [[ $image_url != file* ]]; then
# Downloads the image (uec ami+aki style), then extracts it.
if [[ ! -f $FILES/$IMAGE_FNAME || "$(stat -c "%s" $FILES/$IMAGE_FNAME)" = "0" ]]; then
wget -c $image_url -O $FILES/$IMAGE_FNAME
if [[ $? -ne 0 ]]; then
echo "Not found: $image_url"
return
fi
wget -c $image_url -O $FILES/$IMAGE_FNAME
if [[ $? -ne 0 ]]; then
echo "Not found: $image_url"
return
fi
fi
IMAGE="$FILES/${IMAGE_FNAME}"
else
@ -1420,7 +1420,7 @@ function upload_image() {
vmdk_create_type="${vmdk_create_type%?}"
descriptor_data_pair_msg="Monolithic flat and VMFS disks "`
`"should use a descriptor-data pair."
`"should use a descriptor-data pair."
if [[ "$vmdk_create_type" = "monolithicSparse" ]]; then
vmdk_disktype="sparse"
elif [[ "$vmdk_create_type" = "monolithicFlat" || \
@ -1435,7 +1435,7 @@ function upload_image() {
path_len=`expr ${#image_url} - ${#IMAGE_FNAME}`
flat_url="${image_url:0:$path_len}$flat_fname"
warn $LINENO "$descriptor_data_pair_msg"`
`" Attempt to retrieve the *-flat.vmdk: $flat_url"
`" Attempt to retrieve the *-flat.vmdk: $flat_url"
if [[ $flat_url != file* ]]; then
if [[ ! -f $FILES/$flat_fname || \
"$(stat -c "%s" $FILES/$flat_fname)" = "0" ]]; then
@ -1474,7 +1474,7 @@ function upload_image() {
flat_path="${image_url:0:$path_len}"
descriptor_url=$flat_path$descriptor_fname
warn $LINENO "$descriptor_data_pair_msg"`
`" Attempt to retrieve the descriptor *.vmdk: $descriptor_url"
`" Attempt to retrieve the descriptor *.vmdk: $descriptor_url"
if [[ $flat_path != file* ]]; then
if [[ ! -f $FILES/$descriptor_fname || \
"$(stat -c "%s" $FILES/$descriptor_fname)" = "0" ]]; then
@ -1489,8 +1489,8 @@ function upload_image() {
descriptor_url=$(echo $descriptor_url | sed "s/^file:\/\///g")
if [[ ! -f $descriptor_url || \
"$(stat -c "%s" $descriptor_url)" == "0" ]]; then
warn $LINENO "Descriptor not found $descriptor_url"
descriptor_found=false
warn $LINENO "Descriptor not found $descriptor_url"
descriptor_found=false
fi
fi
if $descriptor_found; then
@ -1498,10 +1498,10 @@ function upload_image() {
`"grep -a -F -m 1 'ddb.adapterType =' $descriptor_url)"
vmdk_adapter_type="${vmdk_adapter_type#*\"}"
vmdk_adapter_type="${vmdk_adapter_type%?}"
fi
fi
#TODO(alegendre): handle streamOptimized once supported by the VMware driver.
vmdk_disktype="preallocated"
fi
fi
#TODO(alegendre): handle streamOptimized once supported by the VMware driver.
vmdk_disktype="preallocated"
else
#TODO(alegendre): handle streamOptimized once supported by the VMware driver.
vmdk_disktype="preallocated"