From patchwork Mon Jun 6 18:56:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 98993 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 A5FB7B6FAC for ; Tue, 7 Jun 2011 04:56:19 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QTey6-00022C-4O; Mon, 06 Jun 2011 18:56:06 +0000 Received: from smtp.outflux.net ([198.145.64.163]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QTey3-00021M-9b for kernel-team@lists.ubuntu.com; Mon, 06 Jun 2011 18:56:03 +0000 Received: from www.outflux.net (serenity-end.outflux.net [10.2.0.2]) by vinyl.outflux.net (8.14.3/8.14.3/Debian-9.2ubuntu1) with ESMTP id p56Iu1Lr007188 for ; Mon, 6 Jun 2011 11:56:02 -0700 Date: Mon, 6 Jun 2011 11:56:01 -0700 From: Kees Cook To: kernel-team@lists.ubuntu.com Subject: [PATCH][kteam-tools] cve-tracker: speed up CVE linkage, add more verbose output Message-ID: <20110606185601.GE25507@outflux.net> MIME-Version: 1.0 Content-Disposition: inline Organization: Ubuntu X-MIMEDefang-Filter: outflux$Revision: 1.316 $ X-HELO: www.outflux.net X-Scanned-By: MIMEDefang 2.69 on 10.2.0.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com We cannot safely use linkCVE due to LP: #439470. Instead, use comment work-around to trigger attachment. Add more verbose output messages too. Signed-off-by: Kees Cook --- stable/create-cve-tracker | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/stable/create-cve-tracker b/stable/create-cve-tracker index 67af11e..16a8be2 100755 --- a/stable/create-cve-tracker +++ b/stable/create-cve-tracker @@ -183,18 +183,15 @@ class CreateCveTracker(StdApp): print("https://bugs.launchpad.net/bugs/%s" % (bug.id)) try: + self.verbose("Updating tags ...\n") bug.tags.append('kernel-cve-tracking-bug') + self.verbose("Marking as security ...\n") bug.security_related = True # Link the appropriate cve to the bug - # - found = False - for cve in self.lp.launchpad.cves: - if title in cve.display_name: - found = True - break - if found: - bug.lpbug.linkCVE(cve=cve) + # Cannot safely use 'linkCVE' due to LP: #439470 + self.verbose("Linking to %s ..." % (title)) + bug.add_comment(content=title) lp = self.lp.launchpad ubuntu = lp.distributions["ubuntu"] @@ -203,7 +200,9 @@ class CreateCveTracker(StdApp): self.verbose("Adding additional packages") pkgs = ['linux-fsl-imx51', 'linux-mvl-dove', 'linux-lts-backport-maverick', 'linux-ti-omap4'] for p in pkgs: + self.verbose("Finding source package '%s' ..." % (p)) pkg = ubuntu.getSourcePackage(name=p) + self.verbose("Adding bug task for '%s' ..." % (p)) t = bug.lpbug.addTask(target=pkg) # Nominate for all active series