From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7111687409920638976 X-Received: by 2002:a17:902:a607:b0:168:f08d:d04 with SMTP id u7-20020a170902a60700b00168f08d0d04mr29236897plq.70.1655818762777; Tue, 21 Jun 2022 06:39:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a63:1a0b:0:b0:3fd:9834:5d21 with SMTP id a11-20020a631a0b000000b003fd98345d21ls5558509pga.9.gmail; Tue, 21 Jun 2022 06:39:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tnlKlccWDfKmLhjlc4ohO3m8Mqj7lj7upgbZNOWOSfBym8eCuY1HSgmyTpQbSTmiJKQ72B X-Received: by 2002:a05:6a00:1687:b0:518:6c6b:6a9a with SMTP id k7-20020a056a00168700b005186c6b6a9amr30267568pfc.81.1655818762101; Tue, 21 Jun 2022 06:39:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655818762; cv=none; d=google.com; s=arc-20160816; b=FDQslXndK5sRqMSMmIAi8XmwpmFJoMswvGlvzaltxoPr16vj4cDog/AA3l+PM+K9gw APqNFQ/o0THMhHVpdGIkc/FEC/1pc0qpVc4lRRWOld9QciwKYd/eHD93D9ddjr2q5/il m6KqlfCoFPWW4dK/Sp2oA8llQfnyb1ACwZR6j8fx7SXb0pcdckI/J+leOlNhZj2JRdp5 Au5FyLBgRADiOzT8VUutyE/dahGTkaHNhzuo2DIds2qQvU8XoNOGVoYTnD0q0pFCIBNB ZCgCsmmbDELJluMEePUU7ewsyqM9xCKVuoZe4sOqbOqGFDXjZMMjGmNVCaequ9OerTCK k5jA== 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=rXo2n7ajQgaVMEcbUfMpG1r6IXOV1EeWcacaTeJyl+Y=; b=NuVy/yEZM8sZerSUXiCxu7q0RUUcY4ZK2bAXadwQK4FdE0PTd6ObujjoG+Rvu4ZZX9 HNrJJtMh+Ce+fuML+mbyhqhPXJoW0lXSsj6DacLibg8afdojEBO7put9o3dH902nv6yU MYAUubBnsMwRE8K1C9vfKrF0HKMPCce6XcVjcKLRX34C/wSEmgWXI6UAmFzYwszYXPlW dt5UhBQ0rX0GmikyiR4CNn+rUzQD3RuuAtV8pLri1fVixBSXRQE02PNqf+OOMVPt2vFi 2lPZWrHgrMBQj7+cj/KTUvH9oCIKtdGqP+M+1ddVvR7e93cvGffnnyqBOpQDQqILt0/K 5KsA== 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 lj12-20020a17090b344c00b001eaea2c86a3si661923pjb.0.2022.06.21.06.39.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jun 2022 06:39:22 -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-222-67-120-178.brest.dynamic.pppoe.byfly.by [178.120.67.222]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 25LDd50g031134 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Jun 2022 15:39:16 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH v1 04/11] dpkg-base: fix conflicting variable names Date: Tue, 21 Jun 2022 16:38:49 +0300 Message-Id: <20220621133856.4673-5-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220621133856.4673-1-amikan@ilbers.de> References: <20220621133856.4673-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: 7+kQ8MotDzEd Using '_remove' postfix in variable names will conflict with override syntax rebuild script. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-base.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 7e032ba..be85134 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -273,10 +273,10 @@ deb_clean() { continue; fi package=$(basename "${d}") - package_remove="/usr/bin/apt-get remove -y ${package%%_*}" - sudo -E chroot ${BUILDCHROOT_DIR} ${package_remove} || true + rm_cmd="/usr/bin/apt-get remove -y ${package%%_*}" + sudo -E chroot ${BUILDCHROOT_DIR} ${rm_cmd} || true if [ "${BUILDCHROOT_DIR}" != "${BUILDCHROOT_TARGET_DIR}" ]; then - sudo -E chroot ${BUILDCHROOT_TARGET_DIR} ${package_remove} || true + sudo -E chroot ${BUILDCHROOT_TARGET_DIR} ${rm_cmd} || true fi done fi -- 2.17.1