From patchwork Tue May 2 13:49:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 757613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3wHN2C6mx7z9s7B; Tue, 2 May 2017 23:49:39 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="XL0gZ64v"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1d5YBJ-0002Sn-M6; Tue, 02 May 2017 13:49:33 +0000 Received: from mail-wm0-f51.google.com ([74.125.82.51]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1d5YBE-0002SO-Up for kernel-team@lists.ubuntu.com; Tue, 02 May 2017 13:49:28 +0000 Received: by mail-wm0-f51.google.com with SMTP id r190so20935675wme.1 for ; Tue, 02 May 2017 06:49:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=zr9wd4Ju4Gp92RaTBcDrghs1MPoiZ4meODtr/G55UMY=; b=XL0gZ64vsZS6RpRkf9NphUPO+hDXDPdcA5X1N6PgO2JAPAHi8Nqm04Mh3kvMuH5mVR 2HF1pXLzuGcerG/YTdnSRPaAvulUyqjeOjiPS2i4Y+4vfCMWX0SwBVy44kO75X6julxZ lbgKYa7W0Gdvgxm/yDS1k1xFfhGwHDEPXgn+AXnbvYEPQLnkPKHXoIhfpvyvVltWZUwo I0t6dlrXqYTENJDohCvX96FTU5KdJ/A4cZ8Vfoop3PY5jETzBtqGHa6c+R9CZaOjoCdz 4JjnjqS5WT1qKfENm58pkwQiTzqSEcMuu90j+6BV3MWP5FnFvWL/6f6QucXDHkyrJb/z 0Mfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zr9wd4Ju4Gp92RaTBcDrghs1MPoiZ4meODtr/G55UMY=; b=Eb1qFUqT7s6X5OgGyox73uzECyn32dD+Meh1FoGTPWj1iyIHLPNlsHEzJeL+KPrMbB 7cebK4nP5x+G4IKBGbFDfDChvBdfyAAMxddyzk5z3xnP0IUmC4WvB8xB5M2VSRBAFDvF J3UpTZ6iDoS9u8ra0kjihybvx7evaourn72xlqhAYKx/P24nUpgga/G0CQJteKzjfcPB SAorwI3Q5PtH3bbFEWjEib3SxMUAMzBwaI7VkTPix/PG08V0E32KV07UdNBEDXQBt3xY wZRx2YmtA+z2owarNa7VvPPQdotB5dtWPbEYqZIoaKsKVXd4JIBnXzgs8Yzp1rjGqBhx yfyg== X-Gm-Message-State: AN3rC/5VgUFzUmHlmPQVYyAea+oA10HWCftceXMJqgTXWVmjM+XSSzH3 j44qgMfZM+DLjjlK X-Received: by 10.28.178.200 with SMTP id b191mr2060133wmf.134.1493732968527; Tue, 02 May 2017 06:49:28 -0700 (PDT) Received: from localhost (p2003008C4F26208A55B7F27B5742AA41.dip0.t-ipconnect.de. [2003:8c:4f26:208a:55b7:f27b:5742:aa41]) by smtp.gmail.com with ESMTPSA id t124sm1033412wma.10.2017.05.02.06.49.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 May 2017 06:49:27 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [kteam-tools PATCH v3] verify-release-ready: fix for new style of release tb Date: Tue, 2 May 2017 15:49:09 +0200 Message-Id: <20170502134909.9088-1-kleber.souza@canonical.com> X-Mailer: git-send-email 2.11.0 Cc: Thadeu Lima de Souza Cascardo X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com The check for the 'release tracking bug' was still looking for the old style tracking bug on the changelog: * Release Tracking Bug - LP: # Change it catch only the new style: * linux: -proposed tracker (LP: #) Also fails the check if is not an integer. v2 -> v3: - remove check for old style entry - check if is an integer - fix the check for the tb on the master branch - remove an unused variable Signed-off-by: Kleber Sacilotto de Souza Signed-off-by: Thadeu Lima de Souza Cascardo Acked-by: Colin Ian King --- maintscripts/verify-release-ready | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready index 68ef15be..a0390aa5 100755 --- a/maintscripts/verify-release-ready +++ b/maintscripts/verify-release-ready @@ -215,17 +215,18 @@ class VerifyReleaseReady(): # found_tracker = False for line in changelog[1]['content']: - if found_tracker: - if '#' in line: + if '-proposed tracker' in line: + found_tracker = True + try: (junk, tracker_id) = line.split('#') - else: + (tracker_id,junk) = tracker_id.split(')') + tracker_id = int(tracker_id) + except: tracker_id = 'warning' s.status('conformant release tracking bug line', tracker_id) if tracker_id == 'warning': stdo(colored('\t%s\n' % line, 'yellow')) break - if 'Tracking Bug' in line: - found_tracker = True s.status('release tracking bug', found_tracker) # If we are on a topic branch make sure we are not re-using the same tracking @@ -238,15 +239,16 @@ class VerifyReleaseReady(): master_changelog = Debian.master_changelog() found_tracker = False master_tracker_id = 'NOT-FOUND' - l = 0 for line in master_changelog[1]['content']: - l += 1 - if found_tracker: - if '#' in line: + if '-proposed tracker' in line: + try: (junk, master_tracker_id) = line.split('#') + (master_tracker_id, junk) = master_tracker_id.split(')') + master_tracker_id = int(master_tracker_id) + found_tracker = True + except: + break break - if 'Tracking Bug' in line: - found_tracker = True if found_tracker: unique_tracker = tracker_id != master_tracker_id