From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750962531146137600 X-Received: by 2002:a17:906:2ada:: with SMTP id m26mr32007374eje.87.1571830951277; Wed, 23 Oct 2019 04:42:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:4ccb:: with SMTP id q11ls433701ejt.4.gmail; Wed, 23 Oct 2019 04:42:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqwkUSlaxKKedwYaL0H5dF5J1Y/i63jNnorIb2qxT/RtP12y2voWvs7xbBw//IIFgcPfLjkx X-Received: by 2002:a17:906:a38e:: with SMTP id k14mr32905562ejz.253.1571830950752; Wed, 23 Oct 2019 04:42:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571830950; cv=none; d=google.com; s=arc-20160816; b=1EEye1K5Oa4BaVLmc5yZnrbUw/6OlOvqCsQlxVL1SWsdUQF3sWdj+HICMKsXfNDa5J NhYp7tBzlhsXpZlBKvQVQitxYKO6MGojhn7pckc3yWBJiU7iH6Ubi27WO9c/fILccCEi +gmewc1HDCHEUdOLTeWASw5FSUM00ejmX1nCGZGJ/1gSQbh4CoVien5gHq0M4f7uTQmq dDiFbvbXjp0m5UlQq1gOvdikwajK3hqFe+Kh/MmA4cAIVN9lLIOXu52ZIIyeOQ9dkW/y QjhEVosHNkc/doTAjqlrEdw5Smg6oFTcuC4FnNG2RBNR+FMg7+l8cLULrlTqZ8HQg91v PQyg== 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=lw5sGp7Sq7sYjeX5OIryhue8iQtIUSRdgCvBIGQ5ODg=; b=U/Td43bi2miIlsjS/QsL/oSxaQgAdwRijEaCF13R5UEdBPq/5li4NzuZoneG0lixFi Xsw7e7XNviMzBwp6SVaOwA461k/k+6XVR+tllgqMHex1vmIvfMvaJhSpBw7gn2XMgwuk 8vPizLfO1P0uzU+iJLuHGdzqq3JxWPLol7DYjkzDtJJtgDs7q9tSfBohMr8fNRNE/VFv SxjIeL1XFyQMVX630HRKKsUbEAv88feoSZ/J67oRRbPQZueEjWfZg+AF04aVQWVEBx96 9NUTyU3Oeq1qvAtkh/tC0SUuaebjISIO9jzmql1GIV0Uoi9Mzght610FwdEWpVAwdTl7 meQw== 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 o18si126820edz.0.2019.10.23.04.42.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 04:42:30 -0700 (PDT) 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 x9NBgUWM002282 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 13:42:30 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.8]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9NBgUEF024249; Wed, 23 Oct 2019 13:42:30 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCHv2 3/9] base_apt_helper: change variable names to increase readability Date: Wed, 23 Oct 2019 13:42:21 +0200 Message-Id: <20191023114227.31308-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191023114227.31308-1-henning.schild@siemens.com> References: <20191023114227.31308-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: FFbtiYoiSZ0J 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 c2db3f7..bd8685d 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=$( basename "${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