From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6616611755983372288 X-Received: by 2002:a2e:9783:: with SMTP id y3-v6mr294604lji.21.1540549975146; Fri, 26 Oct 2018 03:32:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:4a09:: with SMTP id x9-v6ls149737lja.18.gmail; Fri, 26 Oct 2018 03:32:54 -0700 (PDT) X-Google-Smtp-Source: AJdET5ehF0Z2Nr7hay3vAAON3LKApnZv+E+gppST+9sOA3lPTRRRs/3Ma5ZvN7W5h7vFwEJFRmJp X-Received: by 2002:a2e:9245:: with SMTP id v5-v6mr292803ljg.20.1540549974682; Fri, 26 Oct 2018 03:32:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540549974; cv=none; d=google.com; s=arc-20160816; b=RxaEsW/vMot9N0WkGpmxOU0YGuPTt8KlEQp5RI/laHnSHF3W8mXlOl4lLK6bvZAePD WuxW5dpuNDxez8pgu8mK3ENHe+S+zYYCV6tH9Qij3OPj8pE6vkyyERx2sewQnYpilcle MoD1NzXRcAd6/8kG85dOanLpXlxa+B6clxjVipO9GiHvWtLm0dO1kCfSxwu/Ejr7eaSC bJKzDcF91WhdwBjVnszFEO+5Wcu2mtHDJ8yH77jxlihW3vABOZEL/hzKTqCgwIlWcH2W Cl6vC01uJ5YFOPyH/ByS0sF1wt46RuOsM1YHtwP2Mq5FiTuj3iwhXFmRnBdFjiwnK3D4 tQXg== 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:to:from; bh=m2IO/mUZMAPByGDkx9Ilqx/UKSTPDrtLHGTnF0aRotY=; b=NAn28RbPqL/xevHWW9kujQ0qLkNryZVAmY7kWIOfzlfDeXtmsVFCFy9MJEl4I94FtF 8GhRp0W/hmGQsV5tXaQcKwm8KsPgllKRsPIlQKnADNALcIFo3AwVTx5r1b6W7kdP0Mt1 bOuiZjGr/JrzkYrzPAj5+L5KbzPpWXyYv6wnJG+sW7yxFZeoTqcO3bgmiKqggCfMECLV 1OlogzX7ZULJZNsvKVtOvARtsvfBO2dA8zS/7CEz6xt22pz1Xmg+yStQOZXmWzAQHpUp Wf3iVSt+gQxBuVoOsNDN1J+Ax4SePb7mWAZ/UmueCJMo/GlvgQU/kfByQAo9Tqm9Jx3V FqRg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id a79-v6si374418ljf.1.2018.10.26.03.32.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 03:32:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@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 mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w9QAWfgH000696 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Fri, 26 Oct 2018 12:32:53 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 4/4] base-apt-helper: Introduce function compare_pkg_md5sums Date: Fri, 26 Oct 2018 12:32:41 +0200 Message-Id: <20181026103241.23755-5-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181026103241.23755-1-mosipov@ilbers.de> References: <20181026103241.23755-1-mosipov@ilbers.de> X-TUID: g6N/lEI0gHt1 Reuse common code block as a function. Suggested-by: Henning Schild Signed-off-by: Maxim Yu. Osipov --- meta/classes/base-apt-helper.bbclass | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass index 7c58b7c..eb28f76 100644 --- a/meta/classes/base-apt-helper.bbclass +++ b/meta/classes/base-apt-helper.bbclass @@ -4,6 +4,16 @@ DISTRO_NAME ?= "${@ d.getVar('DISTRO', True).split('-')[0]}" DISTRO_SUITE ?= "${@ d.getVar('DISTRO', True).split('-')[1]}" +compare_pkg_md5sums() { + pkg1=$1 + pkg2=$2 + + md1=$(md5sum $pkg1 | cut -d ' ' -f 1) + md2=$(md5sum $pkg2 | cut -d ' ' -f 1) + + [ "$md1" = "$md2" ] +} + populate_base_apt() { search_dir=$1 @@ -20,21 +30,13 @@ populate_base_apt() { if [ -n "$isar_package" ]; then # Check if MD5 sums are identical. This helps to avoid the case # when packages is overridden from another repo. - md1=$(md5sum $package | cut -d ' ' -f 1) - md2=$(md5sum $isar_package | cut -d ' ' -f 1) - if [ "$md1" = "$md2" ]; then - continue - fi + compare_pkg_md5sums "$package" "$isar_package" && continue fi # Check if this package is already in base-apt isar_package=$(find ${REPO_BASE_DIR}/${DISTRO_NAME} -name $base_name) if [ -n "$isar_package" ]; then - md1=$(md5sum $package | cut -d ' ' -f 1) - md2=$(md5sum $isar_package | cut -d ' ' -f 1) - if [ "$md1" = "$md2" ]; then - continue - fi + compare_pkg_md5sums "$package" "$isar_package" && continue # md5sum differs, so remove the package from base-apt name=$(echo $base_name | cut -d '_' -f 1) -- 2.11.0