packages/sg3_utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!12 Fix grammar problems caused by 0003-sg3_utils-1.42-delete-lun-rescan-scsi-bus-report-error.patch

Browse Source 
From: @wenchao-hao
Reviewed-by: @wubo009
Signed-off-by: @liuzhiqiang26
This commit is contained in:
openeuler-ci-bot 2020-12-11 12:26:45 +08:00 committed by Gitee
commit da8fd79ba5
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0003-sg3_utils-1.42-delete-lun-rescan-scsi-bus-report-error.patch
View File

@ -16,7 +16,7 @@ index 25a5f2a..dc3026a 100755
# If block directory exists && and PQUAL != 0, we unmapped lun0 and just have a well-known lun
# If block directory doesn't exist && PQUAL == 0, we mapped a real lun0
- if [ "$lun" -eq 0 ] && [ $IPTYPE -eq 0 ] ; then
+ if [ "x$lun" -eq x0 ] && [ x$IPTYPE -eq 0 ] ; then
+ if [ x"$lun" = x0 ] && [ x$IPTYPE = x0 ] ; then
if [ $RC = 2 ] ; then
if [ -e "$devpath" ] ; then
if [ -d "$devpath/block" ] ; then
@ -25,7 +25,7 @@ index 25a5f2a..dc3026a 100755
fi
fi
- elif [ $RC = 0 ] && [ $IPTYPE -eq 0 ] ; then
+ elif [ $RC = 0 ] && [ x$IPTYPE -eq x0 ] ; then
+ elif [ $RC = 0 ] && [ x$IPTYPE = x0 ] ; then
if [ -e "$devpath" ] ; then
if [ ! -d "$devpath/block" ] ; then
remappedlun0=1 # Transition from well-known to real lun 0
@ -34,7 +34,7 @@ index 25a5f2a..dc3026a 100755
# Special case: lun 0 just got added (for reportlunscan),
# so make sure we correctly treat it as new
- if [ "$lun" = "0" ] && [ "$1" = "1" ] && [ -z "$remappedlun0" ] ; then
+ if [ x"$lun" = x"0" ] && [ "$1" = "1" ] && [ -z "$remappedlun0" ] ; then
+ if [ x"$lun" = x"0" ] && [ x"$1" = x"1" ] && [ -z "$remappedlun0" ] ; then
SCSISTR=""
printf "\r\e[A\e[A\e[A"
fi
@ -43,7 +43,7 @@ index 25a5f2a..dc3026a 100755
else
echo "scsi remove-single-device $devnr" > /proc/scsi/scsi
- if [ $RC -eq 1 ] || [ "$lun" -eq 0 ] ; then
+ if [ $RC -eq 1 ] || [ x"$lun" -eq x0 ] ; then
+ if [ $RC -eq 1 ] || [ x"$lun" = x0 ] ; then
# Try readding, should fail if device is gone
echo "scsi add-single-device $devnr" > /proc/scsi/scsi
fi

6
sg3_utils.spec
View File

@ -1,6 +1,6 @@
Name: sg3_utils
Version: 1.45
Release: 2
Release: 3
Summary: Utilities that send SCSI commands to devices.
License: GPL-2.0-or-later AND BSD
URL: http://sg.danny.cz/sg/sg3_utils.html
@ -73,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
%{_mandir}/man8/*
%changelog
* Wed Nov 10 2020 haowenchao <haowenchao@huawei.com> - 1.45-3
- Fix grammar problems caused by patch
0003-sg3_utils-1.42-delete-lun-rescan-scsi-bus-report-error.patch
* Wed Nov 5 2020 lixiaokeng <lixiaokeng@huawei.com> - 1.45-2
- add make check