From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a2e:8250:0:b0:24f:29c4:a66 with SMTP id j16-20020a2e8250000000b0024f29c40a66mr16089038ljh.307.1651761604693; Thu, 05 May 2022 07:40:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:553:b0:250:615f:dbd1 with SMTP id q19-20020a05651c055300b00250615fdbd1ls1112539ljp.7.gmail; Thu, 05 May 2022 07:40:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjaYahMysLwMbIc6L9kJQvc6NIEbey29U9NpRPb04JY3aoc8ndkLSOQkiIQ9XtwqilZbNY X-Received: by 2002:a2e:80ce:0:b0:24f:2a1a:ffc6 with SMTP id r14-20020a2e80ce000000b0024f2a1affc6mr16677054ljg.169.1651761603670; Thu, 05 May 2022 07:40:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651761603; cv=none; d=google.com; s=arc-20160816; b=AsBcz+NXqblacvCdhVBGKcRY+Q9+eldFtgxo/PkmnE5UdhH4W6GADssSsYEWA06TLg FG+M2sAIn2ocNTjeXWkFsZ2KChLnocezZqDUvW86ggl9K6R6PeoNqH1c2rLgfGBv/LPL iPFCK+fNo8Mv6+t0dsGaIfyL1SJO0t5zd9Bamuf2k5QByctRnbGIVBBSKJpZ+RdA+q32 m7siCutr+673JN0dLGG5/1kScWAvyRuZxKysDsSrEYmENFzpUdpKyYXCimUXhDut0ep7 az+aqncT0G0Q2PRdUHDiJYsUk3yfZNiwvBhOg+KeeqNwr/w6XKtsUNk7uZJA24pDp+OB K8Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=TYfaxgcwuGqwDToMNjBjl7IXG1nDBINTd8VKfvUwImc=; b=hPLPVje05IkCbRzyk6nSZ4e9SVxV53rupR7dBO+M9XJ8MXQOlduUbjutIQgmaDg9KB 0sZrgilUSSy1+VRmBMiyqMu0/zCRWoBtieKsmLh4DxpcFdnP+4ZEOCBGjyva5BKJca3r B5nGf5J3fg4eoINrm8HS1t+YTZW3Dq94AL9sRt5zBNFv1ljLoMFMlEs9QjHF0lfUYc0y mKNPGKFPPptwRmP9jw3ixuXt4qKNKIW0loDp7gR+MWl/26sAszuiKIn+SsMrUdfxe7Gw mGsxVrTG2eziEdBsA5vrf3G3Ewx8n1VuY75eiw9OmTTtRYxN5jT/JokCK6s2fYc4ae3T kmdA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id c22-20020a056512325600b0047216d2d1a9si81509lfr.2.2022.05.05.07.40.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 07:40:03 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-0-74-214-37.mgts.dynamic.pppoe.byfly.by [37.214.74.0] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 245Edf7l014026 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 May 2022 16:40:02 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH v10 19/19] dpkg-base: Cleanup on schroot fail Date: Thu, 5 May 2022 17:39:34 +0300 Message-Id: <20220505143934.16096-20-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505143934.16096-1-amikan@ilbers.de> References: <20220505143934.16096-1-amikan@ilbers.de> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: 7oTS3efNMF+5 Cleanup schroot configs in case schroot exit with non zero state. Handle all possible interrupt cases with trap. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-base.bbclass | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index e879bf9..c543eb2 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -107,6 +107,13 @@ python() { do_apt_fetch() { E="${@ isar_export_proxies(d)}" schroot_create_configs + + schroot_cleanup() { + schroot_delete_configs + } + trap 'exit 1' INT HUP QUIT TERM ALRM USR1 + trap 'schroot_cleanup' EXIT + for uri in "${SRC_APT}"; do schroot -d / -c ${SBUILD_CHROOT} -- \ sh -c 'mkdir -p /downloads/deb-src/"$1"/"$2" && cd /downloads/deb-src/"$1"/"$2" && apt-get -y --download-only --only-source source "$2"' my_script "${DISTRO}" "${uri}" @@ -126,6 +133,13 @@ do_apt_fetch[depends] += "${SCHROOT_DEP}" do_apt_unpack() { rm -rf ${S} schroot_create_configs + + schroot_cleanup() { + schroot_delete_configs + } + trap 'exit 1' INT HUP QUIT TERM ALRM USR1 + trap 'schroot_cleanup' EXIT + for uri in "${SRC_APT}"; do schroot -d / -c ${SBUILD_CHROOT} -- \ sh -c ' \ -- 2.17.1