From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750962531146137600 X-Received: by 2002:a05:6402:339:: with SMTP id q25mr5496604edw.80.1573152966545; Thu, 07 Nov 2019 10:56:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:db0b:: with SMTP id t11ls1790567eds.1.gmail; Thu, 07 Nov 2019 10:56:06 -0800 (PST) X-Google-Smtp-Source: APXvYqw2ObaPdJzffJjaCa5uamFdoimFQz3ccp2O19v4oAZelWzwnwNBkfydMj1js1uqg/vJJVWJ X-Received: by 2002:a50:ed12:: with SMTP id j18mr5548331eds.172.1573152966093; Thu, 07 Nov 2019 10:56:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573152966; cv=none; d=google.com; s=arc-20160816; b=yt58unFvoTd/mXVrrhRycqZed9WWSwxtRVe0P/pYFwaQOpwJ75MsVNDuojVG5q1pPg /+zbwHA5LL0uFR0ukL08kjG5ZGbBV3szl/O9YqKv34ja71XpstxP92XUM9jmqlON/OuD HhSk1KpfcjmGomSUpWUPRJ+dTm3WmbzknBIZnpT1tXTTi+Yuig/xcvGyNnKASAmq4G+b JdvES711OeJ+U2y4LxH8wfYEkZtQSF/LxDhI6SNKJiPji9f/4kbAzVl4hJlMruKiF3NQ s/GKRFY/dAMscu/CnXjueDo8TcCXLKAjiAGHy8lz8QHeBrEIjJX1yVHLfS6PPK+l7S8x SB+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=rW5qlh5KDXgmjyGKTurRVmsSW6nLdYpAoMTF+DQaP8k=; b=E5Q/qZnhVd1YymbC/9bUY+C6GRm3u6WSCatETTnGER5stOtmaqBHPgMox8ghPMCLOZ UenBuP77aQcapV5kDFUiYDbgZzWe/KZnikdWReASS+4oMZL8PuPWIAXWuB/qJDfDKQo7 c0SJoXm4+2PCEo9ug1WvzoGCBzFAd3f3/JLelkqcQo58LyVCHNUyWT5K0Ps+VxG62kDZ Q7tymRqe6cOp0uUqlV5ez4NWYe3jX/qErjruhDq69vpmZ6s9umxvAB4CYhbDEJWeRiNA Z5wf7/jc6yytVMP4VK3H+BuM5agleJOsOhQbZUoq8pFXqAW2dL+XR+UOsXajYFMp7C9/ Rxkw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id c28si187095eda.4.2019.11.07.10.56.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Nov 2019 10:56:06 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id xA7Iu57v008936 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 7 Nov 2019 19:56:05 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.32]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id xA7Iu5A8030558; Thu, 7 Nov 2019 19:56:05 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv3 2/9] base_apt_helper: change variable names to increase readability Date: Thu, 7 Nov 2019 19:55:56 +0100 Message-Id: <20191107185603.9077-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191107185603.9077-1-henning.schild@siemens.com> References: <20191107185603.9077-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: LUNVLaCmsPP8 From: Henning Schild Use (isar|base)_apt_p instead of "isar_package" as variable name for package comparison. Signed-off-by: Henning Schild --- meta/classes/base-apt-helper.bbclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass index 81df45a..d5674c9 100644 --- a/meta/classes/base-apt-helper.bbclass +++ b/meta/classes/base-apt-helper.bbclass @@ -27,17 +27,17 @@ populate_base_apt() { # Check if this package is taken from Isar-apt, if so - ingore it. base_name=${package##*/} - isar_package=$(find ${REPO_ISAR_DIR}/${DISTRO} -name $base_name) - if [ -n "$isar_package" ]; then + isar_apt_p=$(find ${REPO_ISAR_DIR}/${DISTRO} -name $base_name) + if [ -n "$isar_apt_p" ]; then # Check if MD5 sums are identical. This helps to avoid the case # when packages is overridden from another repo. - compare_pkg_md5sums "$package" "$isar_package" && continue + compare_pkg_md5sums "$package" "$isar_apt_p" && continue fi # Check if this package is already in base-apt - isar_package=$(find ${REPO_BASE_DIR}/${BASE_DISTRO} -name $base_name) - if [ -n "$isar_package" ]; then - compare_pkg_md5sums "$package" "$isar_package" && continue + base_apt_p=$(find ${REPO_BASE_DIR}/${BASE_DISTRO} -name $base_name) + if [ -n "$base_apt_p" ]; then + compare_pkg_md5sums "$package" "$base_apt_p" && continue # md5sum differs, so remove the package from base-apt name=$(echo $base_name | cut -d '_' -f 1) -- 2.23.0