From patchwork Wed Feb 10 12:23:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 45026 X-Patchwork-Delegate: stefan.bader@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 8B2B0B7D59 for ; Wed, 10 Feb 2010 23:24:01 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NfBbm-0006jt-JJ; Wed, 10 Feb 2010 12:23:54 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NfBbh-0006ib-U8 for kernel-team@lists.ubuntu.com; Wed, 10 Feb 2010 12:23:49 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1NfBbh-0004k6-T6 for ; Wed, 10 Feb 2010 12:23:49 +0000 Received: from 79-66-152-200.dynamic.dsl.as9105.com ([79.66.152.200] helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1NfBbh-0006ql-PP for kernel-team@lists.ubuntu.com; Wed, 10 Feb 2010 12:23:49 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3] UBUNTU: git-ubuntu-log -- tighten up Bug: NNNN matching Date: Wed, 10 Feb 2010 12:23:46 +0000 Message-Id: <1265804627-21720-3-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1265804627-21720-1-git-send-email-apw@canonical.com> References: <1265804627-21720-1-git-send-email-apw@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com We are currently miss-matching lines such as the following as Bug: number links: BUG: unable to handle kernel NULL pointer dereference at (null) Ensure that lines only contain numbers, hashes (#), commas (,) and spaces. Signed-off-by: Andy Whitcroft --- debian/scripts/misc/git-ubuntu-log | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/scripts/misc/git-ubuntu-log b/debian/scripts/misc/git-ubuntu-log index 2ac19bc..ab4b7d6 100755 --- a/debian/scripts/misc/git-ubuntu-log +++ b/debian/scripts/misc/git-ubuntu-log @@ -189,8 +189,8 @@ sub changelog_input { } while () { $ignore = 1 if ($do_ignore && /^ *Ignore: yes/i); - if (/^ *Bug: *(#|)(.*)/i) { - foreach $k (split('(,|)*\s*#', $2)) { + if (/^ *Bug: *(#|)([0-9#,\s]*)\s*$/i) { + foreach $k (split('(,|\s)\s*(#|)', $2)) { $bugz{$k} = 1 if (($k ne '') and ($k =~ /[0-9]+/)); } }