From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6821034277812043776 X-Received: by 2002:adf:91e1:: with SMTP id 88mr38499717wri.67.1588145801567; Wed, 29 Apr 2020 00:36:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f347:: with SMTP id e7ls29591266wrp.4.gmail; Wed, 29 Apr 2020 00:36:41 -0700 (PDT) X-Google-Smtp-Source: APiQypIgVb0QKi+g5Yivg35Xx61pjaJFNocCwSrmmQYayKUREdqleyvLE3gs8KDVgBww1lwhmuNM X-Received: by 2002:adf:e2c2:: with SMTP id d2mr40583256wrj.55.1588145800979; Wed, 29 Apr 2020 00:36:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588145800; cv=none; d=google.com; s=arc-20160816; b=cQH1r8wzSdwa/dE4PFrmcHdIGVKZ3bhIF1TKJ4B8VJ7SYdcFIWTfqVNlY+O2F+GjVU aPdP7RKfXIxc1q8LRKU85P/qxO/F8jNW5GpXQwfZIGoKjDnRVVcm4i4hb5h5rpToIOXv ZCpuarxid6qnPnWOXCIL5p2geAEZM3d8ilp0ui8OxkSzbC8JiUQwJMqff4GIernzKhAj Pqwmcm0zXP4k0cp7AXT+cVR3Ky5rasvF47xZBFNgCPRuru1cKSQI4M7ddoHZYXEi+66w zAgNi7beV0Xc+wfC3uWDydD6R4MEU4fe+l+4h2SqFjc+EKMLb4pSxg8bdjDER4yp0Woh gmZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:cc:to:subject:from; bh=whZIbk6+ikAOdfvwC9P00LkBqHBtQv4ZulKGURkpInM=; b=wYMQNBUev8iKSDPCHqjpZt02d0ZRCoVjelyj3ZZ7SRsQ9kQdCTeAJnevsj071MihVi cPN7EqEzi/xxu2Kq/zYHRrFXhd0Vimr+57D20WM/W/gY0JkyBtNzsDPxVy3OhqIawPai ZB3XxUb8M7rciEZjgGVnsY1kaoktJmUWO3cjnCRZZ8qnikLFoRa6K7E65dUAPTEVFvmx E/Z0O+arW3tFiocDqj9QwexqWor+pIMW9YKl1nF0rIwwfq9CAHQP607SZ+7e69+jbeGs nfVO+IOkc6bA0O/SldnfuUx/rv+zatWLHKYt7RBwuMOJEgH13MSHjewoedYUgIAcyiPu 8KRg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id u16si307573wmd.2.2020.04.29.00.36.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Apr 2020 00:36:40 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 03T7aejM025547 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 29 Apr 2020 09:36:40 +0200 Received: from [167.87.241.229] ([167.87.241.229]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03T7aexr013891; Wed, 29 Apr 2020 09:36:40 +0200 From: Jan Kiszka Subject: [PATCH] debianize: Switch version-existing check to dpkg-parsechangelog To: isar-users Cc: Henning Schild Message-ID: Date: Wed, 29 Apr 2020 09:36:40 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: x4SKQ3g0YWM/ From: Jan Kiszka This also reduces the check to the version, ignoring the package name. Suggested-by: Henning Schild Signed-off-by: Jan Kiszka --- meta/classes/debianize.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index e77be232..764477c8 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -34,9 +34,8 @@ ${PN} (${changelog_v}) UNRELEASED; urgency=low -- ${MAINTAINER} ${date} EOF if [ -f ${WORKDIR}/changelog ]; then - if head -1 "${WORKDIR}"/changelog | \ - grep -q -e "^${PN} (${changelog_v})" - then + latest_version=$(dpkg-parsechangelog -l ${WORKDIR}/changelog -S Version) + if [ "${latest_version}" = "${changelog_v}" ]; then # entry for our version already there, use unmodified rm ${S}/debian/changelog else -- 2.16.4