From patchwork Tue Oct 17 08:52:56 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: 827383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3yGtSF1HkJz9t30; Wed, 18 Oct 2017 11:37:33 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1e4Ncz-0001rP-Hd; Tue, 17 Oct 2017 08:53:33 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1e4NcS-00019k-EJ for kernel-team@lists.ubuntu.com; Tue, 17 Oct 2017 08:53:00 +0000 Received: from mail-wm0-f71.google.com ([74.125.82.71]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1e4NcR-0006CD-7p for kernel-team@lists.ubuntu.com; Tue, 17 Oct 2017 08:52:59 +0000 Received: by mail-wm0-f71.google.com with SMTP id k4so558447wmc.20 for ; Tue, 17 Oct 2017 01:52:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=ubGRoBinMnKtArmnVLIN0D3bfaQB0uYn/GZ18/2K3/I=; b=O69PbMY1lwW+Jv9TkpjS7FaSMI6AXkjVW1tYI/vbS9AJL5NuNqfuz/F7aRya1+hs/K xivstSVfWC4K4m08ARqhgG4zaJ9Ngb0sYPPATjA7n9L1Os6XI9o1Nfn9oJxXDZy3Q0TJ piAanoOB5lXGuE+1iMNuP0JInjF0/NfKhFhA56S5u7xXAVimRQVULcNayZuqsmaShhS1 XRgA3dO8SMMKurt9oi1NJooIdeXpzXPn23L8QcKUHMTnBZ3GJ1ZuLWf2PLYYGWBy/pJ1 fburnW0S/UiRrzeTBo9IyruM38ssvsrBBZM1x/XidFBu3D0oyvN0vL84w8/BpY4XNAqi AzDw== X-Gm-Message-State: AMCzsaXZiEMbEvygb0KSIHHXiNZ19sefZxnY/yb/EeD26/EmVljaNWi1 IqyA5hFootuCIJQ40xgmN4cD53xK2WVSdmPH9WSrAyVrqp1jkgMQ6nhur6Y+zBxclID+OnlbddB AQFYWEqv6lZobm08M+pvufG/zNAJZMLHc7gBpCO6Y0g== X-Received: by 10.28.32.136 with SMTP id g130mr3105072wmg.102.1508230378606; Tue, 17 Oct 2017 01:52:58 -0700 (PDT) X-Google-Smtp-Source: ABhQp+S8jB264paO4Ks7lwM43GFIU1FOOjfbmYLqnzW1OeLz3eQukHJhGb0ENmMLpX35tp2HvZPc5A== X-Received: by 10.28.32.136 with SMTP id g130mr3105056wmg.102.1508230378266; Tue, 17 Oct 2017 01:52:58 -0700 (PDT) Received: from localhost ([2a02:8109:a540:7e8:1c16:db:415d:a9ce]) by smtp.gmail.com with ESMTPSA id j73sm29084945wmf.15.2017.10.17.01.52.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Oct 2017 01:52:57 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [PATCH v2][kteam-tools] ktl/tracking_bug.py: fix snap tasks lookup Date: Tue, 17 Oct 2017 10:52:56 +0200 Message-Id: <20171017085256.10917-1-kleber.souza@canonical.com> X-Mailer: git-send-email 2.14.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 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" The layout of the snap-related information has been changed on kernel-series-info.yaml. So change ktl/tracking_bug.py for the new layout. Signed-off-by: Kleber Sacilotto de Souza Acked-by: Marcelo Henrique Cerri --- ktl/tracking_bug.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/ktl/tracking_bug.py b/ktl/tracking_bug.py index 426d39b0..20fa8466 100644 --- a/ktl/tracking_bug.py +++ b/ktl/tracking_bug.py @@ -16,6 +16,7 @@ class TrackingBug: self.wf = Workflow() self.ub = Ubuntu() self.__dependency_list = None + self.__dependency_snaps = None self._targeted_series_name = None self._series_specified = None self._series_target = None @@ -40,6 +41,21 @@ class TrackingBug: retval = dependent_package in self.__dependency_list return retval + # get_dependent_snap + def get_dependent_snap(self, series, main_package): + ''' + Return the name of the dependent snap for the specified series/package. + Return None if not found. + ''' + if self.__dependency_snaps is None: + try: + record = self.ub.lookup(series) + self.__dependency_snaps = record['dependent-snaps'][main_package] + except KeyError: + self.__dependency_snaps = {} + + return self.__dependency_snaps.get('snap') + # valid_series # def valid_series(s, lp_series, series_specified, targeted_series_name, package): @@ -64,7 +80,7 @@ class TrackingBug: if lp_series.name == 'prepare-package-signed' and not s.has_dependent_package(targeted_series_name, package, 'signed'): cdebug(' no prepare-package-signed', 'yellow') break - if not s.has_dependent_package(targeted_series_name, package, 'snap'): + if s.get_dependent_snap(targeted_series_name, package) is None: if lp_series.name == 'snap-release-to-edge': cdebug(' no snap-release-to-edge', 'yellow') break