forked from pool/build-compare
Accepting request 261214 from home:Andreas_Schwab:Factory
- Use $(...) instead of `...` to avoid losing backslash quoting OBS-URL: https://build.opensuse.org/request/show/261214 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=152
This commit is contained in:
parent
3c69ae3451
commit
89e4b701b2
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 12 09:29:24 UTC 2014 - schwab@suse.de
|
||||
|
||||
- Use $(...) instead of `...` to avoid losing backslash quoting
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 7 11:12:10 UTC 2014 - ohering@suse.de
|
||||
|
||||
|
@ -89,8 +89,8 @@ function cmp_spec ()
|
||||
fi
|
||||
|
||||
# Remember to quote the . which is in release
|
||||
release1=`$RPM --qf "%{RELEASE}" "$oldrpm"|sed -e 's/\./\\\./g'`
|
||||
release2=`$RPM --qf "%{RELEASE}" "$newrpm"|sed -e 's/\./\\\./g'`
|
||||
release1=$($RPM --qf "%{RELEASE}" "$oldrpm"|sed -e 's/\./\\./g')
|
||||
release2=$($RPM --qf "%{RELEASE}" "$newrpm"|sed -e 's/\./\\./g')
|
||||
# This might happen with a forced rebuild of factory
|
||||
if [ "${release1%.*}" != "${release2%.*}" ] ; then
|
||||
echo "release prefix mismatch"
|
||||
|
@ -64,8 +64,8 @@ NEWRPMS=($(find $NEWDIRS -type f -name \*rpm -a ! -name \*src.rpm -a ! -name \*.
|
||||
|
||||
# Get release from first RPM and keep for rpmlint check
|
||||
# Remember to quote the "." for future regexes
|
||||
release1=`rpm -qp --nodigest --nosignature --qf "%{RELEASE}" "${OLDRPMS[0]}"|sed -e 's/\./\\./g'`
|
||||
release2=`rpm -qp --nodigest --nosignature --qf "%{RELEASE}" "${NEWRPMS[0]}"|sed -e 's/\./\\./g'`
|
||||
release1=$(rpm -qp --nodigest --nosignature --qf "%{RELEASE}" "${OLDRPMS[0]}"|sed -e 's/\./\\./g')
|
||||
release2=$(rpm -qp --nodigest --nosignature --qf "%{RELEASE}" "${NEWRPMS[0]}"|sed -e 's/\./\\./g')
|
||||
|
||||
SUCCESS=1
|
||||
rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature '
|
||||
|
Loading…
Reference in New Issue
Block a user