Automatic merge from release/2.5.0 -> release/2.6.0

* commit '8ffe91e2060a2fc875e5352392b90e5ee79c79c3':
  修正:httperror没有正确parse错误格式
This commit is contained in:
邱剑
2019-01-28 19:31:04 +08:00
+3 -1
View File
@@ -128,7 +128,9 @@ getent passwd %{owner} >/dev/null || /usr/sbin/useradd -r -s /sbin/nologin -d %{
$(for b in $EXTRA_BINS; do echo /opt/yunion/bin/$b; done)
" > $SPEC_FILE
find $ROOT/root/ -type f | sed -e "s:$ROOT/root::g" >> $SPEC_FILE
if [ -d $ROOT/root/ ]; then
find $ROOT/root/ -type f | sed -e "s:$ROOT/root::g" >> $SPEC_FILE
fi
rpmbuild --define "_topdir $BUILDROOT" -bb $SPEC_FILE