Skip to content

Commit 26f0698

Browse files
committed
When building with DSC, an error occurred, but it shouldn't lead to an exit situation.
1 parent df00611 commit 26f0698

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

‎docker/start.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ exec_build(){
2020
echo "clean "
2121
make clean || echo ok
2222
echo "build deb in `pwd` "
23-
if [ $dscflag == "dsc" ];then
24-
make dsc || errlog "build dsc error"
23+
if [ "$dscflag" == "dsc" ];then
24+
make dsc || echo "dsc build error but it is not fatal error"
2525
cp *.dsc *.tar.* /tmp/$PKGDIR
2626
fi
2727
make deb || errlog "build deb error"
2828
# We need copy deb files first beacuse of deb will be clean when dsc build
29-
cp -r /tmp/$PKGDIR/* ./
29+
if [ "$dscflag" == "dsc" ];then
30+
cp -r /tmp/$PKGDIR/* ./
31+
fi
3032
else
3133
dpkg-buildpackage -b -us -uc ||errlog "build deb error"
3234
mv ../*.deb ../*.buildinfo ../*.changes ../*.dsc ../*.tar.* $PKGDIR

‎packages/common.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ exec_build_make(){
1111
make clean || echo ok
1212
echo "build deb in `pwd` "
1313
if [ $dscflag == "dsc" ];then
14-
make dsc || errlog "build dsc error"
14+
make dsc || "dsc build error but it is not fatal error"
1515
fi
1616
DEB_BUILD_OPTIONS=nocheck make deb || errlog "build deb error"
1717
}
@@ -29,4 +29,3 @@ errlog(){
2929
echo $1;
3030
exit 1;
3131
}
32-

0 commit comments

Comments
 (0)