From 7ca8c1259f3e656c1c3aa195c9638e7af2e84944 Mon Sep 17 00:00:00 2001 From: Dave Cottlehuber Date: Thu, 28 Nov 2019 02:07:52 +0000 Subject: [PATCH] ignore result if jail was not built from source as there is nothing to clean --- src/share/poudriere/image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/share/poudriere/image.sh b/src/share/poudriere/image.sh index bc463d54db..c4bae5a84a 100644 --- a/src/share/poudriere/image.sh +++ b/src/share/poudriere/image.sh @@ -402,7 +402,7 @@ touch ${WRKDIR}/src.conf [ ! -f ${POUDRIERED}/${JAILNAME}-src.conf ] || cat ${POUDRIERED}/${JAILNAME}-src.conf >> ${WRKDIR}/src.conf [ ! -f ${POUDRIERED}/image-${JAILNAME}-src.conf ] || cat ${POUDRIERED}/image-${JAILNAME}-src.conf >> ${WRKDIR}/src.conf [ ! -f ${POUDRIERED}/image-${JAILNAME}-${SETNAME}-src.conf ] || cat ${POUDRIERED}/image-${JAILNAME}-${SETNAME}-src.conf >> ${WRKDIR}/src.conf -make -C ${mnt}/usr/src DESTDIR=${WRKDIR}/world BATCH_DELETE_OLD_FILES=yes SRCCONF=${WRKDIR}/src.conf delete-old delete-old-libs +make -C ${mnt}/usr/src DESTDIR=${WRKDIR}/world BATCH_DELETE_OLD_FILES=yes SRCCONF=${WRKDIR}/src.conf delete-old delete-old-libs || [ ! -d "${EXTRADIR}" ] || cp -fRPp ${EXTRADIR}/ ${WRKDIR}/world/ if [ -f "${WRKDIR}/world/etc/login.conf.orig" ]; then