From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6710241650972557312 X-Received: by 2002:a50:9489:: with SMTP id s9mr18702175eda.86.1562673895577; Tue, 09 Jul 2019 05:04:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:27d4:: with SMTP id k20ls2219394ejc.15.gmail; Tue, 09 Jul 2019 05:04:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqzdrcrUCiLOrKcwnO+Kam/HUuNmZYrcwSqaIFEV8pZu4fZH54C8DFDQCB28SY1aPP85c6lu X-Received: by 2002:a17:906:e282:: with SMTP id gg2mr4567019ejb.38.1562673894963; Tue, 09 Jul 2019 05:04:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562673894; cv=none; d=google.com; s=arc-20160816; b=g9yzZwx3aqQhJ8xQuS1YHxhrXAD/M43a7++v8Gz6X3Y7TM4QNnPEcFBMz1pl5IVuT0 DSEG4WQke2VZTc1d2I7+yrVk+ofl/9QsqgJqhudK3CKtMvW8hgHU/0fGXO9awJiPNWcA St+1oUWtDQjLd90h9G2LAXEVhJRQW1e5POHsmkI/6dPOYW84B0O3Je5qz8O72+FZnsqM 3pReiewYEZZhDe2GZqz1KUDQnur7Q13Bkiz+BeMFQiHkDkbI9Yyjd7I8FuYFBirhez+H kruEPTNja96Y7j3dGfQAIJHDtB1O5tL4oJrvP2Wm0NJjhlMPCo8SP/uHjr6ERKn+K8Wz NbwQ== 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; bh=fnuVrO2nbobPb2JRZ6NasnimIRpSKsIJOB6H52I3Kew=; b=jXbynr42hXjsCgjP18Hcml2t2Xhqr0QnnnsmqHqX4BXIMKpg+LOSee2//pJ2kBaSNk FJi3/oo7WMljdDa0qb6fba87qNeraeGu9i5U8pseh1XQgGAEXqKcnW2//6zowEbpglnQ o2JlBy9YtteIpNcCeH+IoVsgXYiYDwZhPEeNdj9wdi7Fwtq5B6KLi50ELjsKqSxJz5kI aumaL8aBqgop1Uqd+bsliCZPSyUfG2nuzIsThwdl6EzcC4sitNFC06eUIz4d6lIbxhhW ZeT0KbeZAlRO6FtbwqxjJYPpZvO6VwUK2doIjf7vQXBe8O99kF7KjymHmCtc+XKt9pwG Kc+g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id jz14si1029585ejb.0.2019.07.09.05.04.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jul 2019 05:04:54 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x69C4saX019928 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 9 Jul 2019 14:04:54 +0200 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x69C4sAE017795; Tue, 9 Jul 2019 14:04:54 +0200 Subject: [PATCH v2] dpkg-base: Do not fail clean if there are no packages To: Henning Schild , isar-users References: <2f342304-e558-f7e1-7550-116620b5f456@siemens.com> <20190708144047.37104f95@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: Date: Tue, 9 Jul 2019 14:04:53 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20190708144047.37104f95@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: vs5Gt0pbvzaw From: Jan Kiszka Use find instead of ls so that non-existing deb packages do not make this fail, just leaving DEBS empty. Signed-off-by: Jan Kiszka --- Changes in v2: - use find instead of ls || true meta/classes/dpkg-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 3e6ba8c..826b5d8 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -101,7 +101,7 @@ do_build() { CLEANFUNCS += "repo_clean" repo_clean() { - DEBS=$( ls ${S}/../*.deb ) + DEBS=$( find ${S}/.. -maxdepth 1 -name "*.deb" ) if [ -n "${DEBS}" ]; then for d in ${DEBS}; do p=$( dpkg-deb --show --showformat '${Package}' ${d} ) -- 2.16.4