From 26f06988425be6befe5897b3f4d31b996523eab2 Mon Sep 17 00:00:00 2001
From: jiangcuo <jiangcuo@bingsin.com>
Date: Fri, 22 Nov 2024 11:20:30 +0800
Subject: [PATCH] When building with DSC, an error occurred, but it shouldn't
 lead to an exit situation.

---
 docker/start.sh    | 8 +++++---
 packages/common.sh | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docker/start.sh b/docker/start.sh
index 6ca4599..c21138c 100644
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -20,13 +20,15 @@ exec_build(){
 		echo "clean "
 		make clean || echo ok
 		echo "build deb in `pwd` "
-		if [ $dscflag == "dsc" ];then
-			make dsc || errlog "build  dsc error"
+		if [ "$dscflag" == "dsc" ];then
+			make dsc || echo  "dsc build error but it is not  fatal error"
 			cp *.dsc *.tar.* /tmp/$PKGDIR
 		fi
                 make deb || errlog "build  deb error"
 		# We need copy deb files first beacuse of deb will be clean when dsc build
-		cp -r /tmp/$PKGDIR/* ./
+		if [ "$dscflag" == "dsc" ];then
+			cp -r /tmp/$PKGDIR/* ./
+		fi
         else
 		dpkg-buildpackage -b -us -uc ||errlog "build deb error"
                 mv ../*.deb ../*.buildinfo ../*.changes ../*.dsc ../*.tar.* $PKGDIR
diff --git a/packages/common.sh b/packages/common.sh
index 4a28ab0..37b51f6 100644
--- a/packages/common.sh
+++ b/packages/common.sh
@@ -11,7 +11,7 @@ exec_build_make(){
         make clean || echo ok
         echo "build deb in `pwd` "
         if [ $dscflag == "dsc" ];then
-                make dsc ||  errlog "build dsc error"
+                make dsc ||  "dsc build error but it is not  fatal error"
         fi
         DEB_BUILD_OPTIONS=nocheck  make deb || errlog "build deb error"
 }
@@ -29,4 +29,3 @@ errlog(){
    echo $1;
    exit 1;
 }
-