From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6519842775260725248 X-Received: by 10.80.171.15 with SMTP id s15mr2158370edc.6.1518019957327; Wed, 07 Feb 2018 08:12:37 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.171.6 with SMTP id s6ls1192235edc.2.gmail; Wed, 07 Feb 2018 08:12:36 -0800 (PST) X-Google-Smtp-Source: AH8x224eOEXWxCuHHaFkLX+IE1iCt4YpDeyXAGrq0uLeeY25Db7NAeC9IqIayHMOdBeLd7VUb9cM X-Received: by 10.80.186.135 with SMTP id x7mr2165777ede.0.1518019956722; Wed, 07 Feb 2018 08:12:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518019956; cv=none; d=google.com; s=arc-20160816; b=FewRcgJOS7X59e1rqhc/7lnDpuBlcIxDPAYZHd8aLFERa4QYqNSm8pbpeikezo0zzH Ae34mS8oKm072/yAw5Bb3+pX2t329VT+KcBqdnb+COhCRHJbnUvseTKt6OBbgnrs0wgW V35C3myULkWf89FBtPx5A4jIpuzMzUXFvYy5/ngPN3Y1Aa6j2Rlpaszq+tPNRvZOqngw t6NN2ty7E5ZQfuR+vMMN9V3h9hWba91TurKMuBxo33OssjvfhzDdT13JqYMN6vnunF1n /g+9uaF9TU9h+10yf95Vof4GksMnszSBnRyZ+U0sRjspXUC/SeFX6oyObW4EtZffocTT hYiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject :arc-authentication-results; bh=/B54EYFOu0/0jpJhnn0PoTRZT/cbgwkhBDe1BtG4LE8=; b=qWWthZRHxuq6kTAUzhz5RglsV6WHLXOHy1hp9XcmFa5TXYb6VyfcxRLbIIHtL8yBfY 3W407e6q1NdHcbXrJypoaCzLXNBdm4dImDYuT7mIkg5Qxhw1x0cEk6dFL6Cob4oU1RDD ojkeZGRCr3tWmIA81urc+A+t7VYytalxYp56m9ishDvDwPqD9718ixeaEFwOlxMEJwY2 rZEaffTobFfqaCSS+g3gxA4AHdm+NDzaW1Q24ODcHgL0RoylKCzD9l1Xj/TRrqEKaKD0 RYkfi3j9AJRfByhd6mGqcP9UcMJg5Hda2c/Afr3Qnzb2F1V3zRniTZmYTi3zqKsxMY6B 2kGQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id z17si161194edz.1.2018.02.07.08.12.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Feb 2018 08:12:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from [10.0.2.15] ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w17GCXs4009205 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Wed, 7 Feb 2018 17:12:35 +0100 Subject: Re: [PATCH] Skip over event handler calls with incomplete environment To: Jan Kiszka , isar-users References: From: Alexander Smirnov Message-ID: Date: Wed, 7 Feb 2018 19:12:28 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: U0SQQCyPe3z4 On 02/07/2018 06:59 PM, Jan Kiszka wrote: > From: Jan Kiszka > > The cleanup handler is called a couple of times per shutdown and, > depending on the setup, some may not have a complete config. Avoid that > we stumble and fall over any of the environment variables being > undefined. > > Signed-off-by: Jan Kiszka Should I apply me previous one? Alex > --- > meta/classes/isar-events.bbclass | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass > index ae0f791..4b5e97e 100644 > --- a/meta/classes/isar-events.bbclass > +++ b/meta/classes/isar-events.bbclass > @@ -15,15 +15,16 @@ python isar_handler () { > distro = d.getVar('DISTRO', True) > arch = d.getVar('DISTRO_ARCH', True) > > - w = tmpdir + '/work/' + distro + '-' + arch > + if tmpdir and distro and arch: > + w = tmpdir + '/work/' + distro + '-' + arch > > - # '/proc/mounts' contains all the active mounts, so knowing 'w' we > - # could get the list of mounts for the specific multiconfig and > - # clean them. > - with open('/proc/mounts', 'rU') as f: > - for line in f: > - if w in line: > - subprocess.call('sudo umount -f ' + line.split()[1], stdout=devnull, stderr=devnull, shell=True) > + # '/proc/mounts' contains all the active mounts, so knowing 'w' we > + # could get the list of mounts for the specific multiconfig and > + # clean them. > + with open('/proc/mounts', 'rU') as f: > + for line in f: > + if w in line: > + subprocess.call('sudo umount -f ' + line.split()[1], stdout=devnull, stderr=devnull, shell=True) > > devnull.close() > } >