From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:ab0:44a3:0:b0:358:b93c:c9e6 with SMTP id n32-20020ab044a3000000b00358b93cc9e6mr7167400uan.81.1653316607798; Mon, 23 May 2022 07:36:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6102:dc8:b0:335:db14:c3ad with SMTP id e8-20020a0561020dc800b00335db14c3adls2413456vst.0.gmail; Mon, 23 May 2022 07:36:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwoQv4clnsP2Sg8+kGcMEM6PzjARgtJyiTQxR+ArEk5lE1iyt3wdc95Xtj3n89zzzr8ezHK X-Received: by 2002:a67:fdc4:0:b0:337:9216:d502 with SMTP id l4-20020a67fdc4000000b003379216d502mr5319463vsq.36.1653316607276; Mon, 23 May 2022 07:36:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653316607; cv=none; d=google.com; s=arc-20160816; b=a4JmcBO4eP7i9TbMCqw3UAFxt0UzbfqBNK8TPkBMYtDtvvn2+nW3KrrlynkwXOLLUQ yDAERwxT7WiNAMP1C2sQQKsN+jGr+pOXT3UOYcMC78iM6pxrsgYLIQaw5qZ4uekJtR5I Rmv2g7ng/0R6ClDfAyo9yil9iFO1qxaqLbqy6JXJqqYMVEiJQsuw6AoMDwq2wFCQPBgX 2s2hQzStpsLfUXotPf3zzQHHUD7QeVYQFbmJDe9G6QxHADD66FsW8NBy6PsuVMJh6T1/ sftHXpAK+tZrxnX4T4un2HCJ7+Vidu/p5ChtB415AS9ryc80UDnA7fqIqzR22jQv9SIk Ve1w== 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=oDf/sFhz4O4ZUWL9ZHNmHRCzIE60li7alMbxwh2zouvY14sUk+q0kxOpIl4+3/G7pr hKqZmfs8BkWwkyMOWvTjMPRnhEjsv+OkcrLinuxHEx6ZKO2lW8AWU2OuZ5/vKtAegfG5 GpHjFe4wK2I7M/E1vfwLaqcIMye41+AjuT6gMoSQM1Dz+YnbliXdYrfYetPfGU6rz/Ds yQAOV8N7D/W0rhaGrqGc0hyyBL5z/VmoiSLNPi397KVyVRU/8JysCm1+ItsXL5rm8EdC lBAPNmfEVuUcGs0v/63AT+77/KQW9jur8/mwhsd/eelmIVRwlEnLAGp7JLx+iYk2VCmh ticw== 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 h12-20020a0561023d8c00b00337a803f1easi210215vsv.1.2022.05.23.07.36.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 May 2022 07:36:47 -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-40-50-214-37.mgts.dynamic.pppoe.byfly.by [37.214.50.40] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 24NEaO3f024879 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 May 2022 16:36:45 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v11 19/21] dpkg-base: Cleanup on schroot fail Date: Mon, 23 May 2022 17:36:15 +0300 Message-Id: <20220523143617.24759-20-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220523143617.24759-1-amikan@ilbers.de> References: <20220523143617.24759-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: RQ9xqSEyJXic 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