From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114179385042665472 X-Received: by 2002:a05:600c:1d17:b0:3a0:481b:f1e1 with SMTP id l23-20020a05600c1d1700b003a0481bf1e1mr12969750wms.136.1656398985214; Mon, 27 Jun 2022 23:49:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:34c6:b0:3a0:4f27:977f with SMTP id d6-20020a05600c34c600b003a04f27977fls1424612wmq.2.gmail; Mon, 27 Jun 2022 23:49:44 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tPQBi7Zm6L0txGDEVko8XpWYMFiswTNfFCZ5708wIQEp5suIlcAl3Z0QqHb8x+hK37ekCo X-Received: by 2002:a05:600c:1c29:b0:39c:52b6:aad0 with SMTP id j41-20020a05600c1c2900b0039c52b6aad0mr24021952wms.203.1656398984489; Mon, 27 Jun 2022 23:49:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656398984; cv=none; d=google.com; s=arc-20160816; b=NRHEny6MhvmphpZS4gX6jwtsy2KyJaMyN67axlYo/bsodQ/CzrQvlI4RUQscrM1Qbu wBAS/GTecqtpTAqxggTDJILbP+lUSiBu5/iG71CMKhmSYGzLTiZd270IaFcWmH3k+Q4X Y6FmhtYD5uqO612DTIBXCAO7O8TJvPmxlqhzQ2BAiAt6yfIVa/ke88udk1PuF12p38v8 ePp2P1kWrZzuLhckuy+FbQKtAs5d9zF1MNQqrQ2fuMc5G658luEf63ffKywEB57vMeL0 lUI2uxrNPluXppR+mXF60LN84+WgJb15voasY9tNhhafpPaM+bxBJHsVCE80kX0XFgVa GtqQ== 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=up/lN2WLgx7ynjhG/Y7SjOkDAEoC83MLoqx9cmxSQrU=; b=x9ZbuNm5hkZrf150YjCX3Q+Cj0UcYA7zrCcKXvSJTJRWunhBMv5rGcM5sIG+bl+hyh DTGIGvl2/8MvTd+6KjmpeDcudbVXmCuI6+NrImzp/Q8K+ZMooCXJFfO7Ed544lbwcgXz DgrZNdjMTGSTCzI8eEtHX55d2t3RadwK6ZFmExrck7NMwRDGeBW7h6BzGG/T9x0291G8 eCHmAsJMmOnz0/jc9vJ7KDG9T2S3MCal7uXrR7zjaywrENHJk43cpty5/dFa2tUgS0j3 RJsNMy3dAKFHPRMJj4y74vQ0s/ipzcNeXqC95oiDbnwxdKQRqEAUjBezrVZGtr77zGuV Japg== 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 w8-20020a5d5448000000b0021b892cde48si435454wrv.8.2022.06.27.23.49.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 23:49:44 -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-172-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.172] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 25S6nMSN030758 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Jun 2022 08:49:43 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v12 19/21] dpkg-base: Cleanup on schroot fail Date: Tue, 28 Jun 2022 09:49:11 +0300 Message-Id: <20220628064913.27938-20-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220628064913.27938-1-amikan@ilbers.de> References: <20220628064913.27938-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: pwzy7uP74poj 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 7948b23..39ab04f 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -106,6 +106,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}" @@ -125,6 +132,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