From patchwork Mon Jun 17 02:20:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Sangorrin X-Patchwork-Id: 10997813 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EC8C914BB for ; Mon, 17 Jun 2019 02:20:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFBF528387 for ; Mon, 17 Jun 2019 02:20:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3A1B28812; Mon, 17 Jun 2019 02:20:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 56A6E28387 for ; Mon, 17 Jun 2019 02:20:57 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id D36DCC6A; Mon, 17 Jun 2019 02:20:56 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id AC3DBC6A for ; Mon, 17 Jun 2019 02:20:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mo-csw.securemx.jp (mo-csw1116.securemx.jp [210.130.202.158]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D2D55E6 for ; Mon, 17 Jun 2019 02:20:54 +0000 (UTC) Received: by mo-csw.securemx.jp (mx-mo-csw1116) id x5H2Kg45010193; Mon, 17 Jun 2019 11:20:42 +0900 X-Iguazu-Qid: 2wHHKs6a8Zoa9sFu5d X-Iguazu-QSIG: v=2; s=0; t=1560738041; q=2wHHKs6a8Zoa9sFu5d; m=XqWrtsghztEqY/AjxRO1FRNXR4PyT/tv8mEObvtDCiA= Received: from imx2.toshiba.co.jp (imx2.toshiba.co.jp [106.186.93.51]) by relay.securemx.jp (mx-mr1110) id x5H2KeXM031656; Mon, 17 Jun 2019 11:20:41 +0900 Received: from enc01.localdomain ([106.186.93.100]) by imx2.toshiba.co.jp with ESMTP id x5H2KeLt024967; Mon, 17 Jun 2019 11:20:40 +0900 (JST) Received: from hop001.toshiba.co.jp ([133.199.164.63]) by enc01.localdomain with ESMTP id x5H2Keac031631; Mon, 17 Jun 2019 11:20:40 +0900 From: Daniel Sangorrin To: ben.hutchings@codethink.co.uk Date: Mon, 17 Jun 2019 11:20:39 +0900 X-TSB-HOP: ON Message-Id: <20190617022039.7197-2-daniel.sangorrin@toshiba.co.jp> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190617022039.7197-1-daniel.sangorrin@toshiba.co.jp> References: <20190617022039.7197-1-daniel.sangorrin@toshiba.co.jp> Cc: cip-dev@lists.cip-project.org Subject: [cip-dev] [cip-kernel-sec 2/2] remotes: call _get_configured_remotes X-BeenThere: cip-dev@lists.cip-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cip-dev-bounces@lists.cip-project.org Errors-To: cip-dev-bounces@lists.cip-project.org X-Virus-Scanned: ClamAV using ClamSMTP This is probably a copy&paste mistake that had no effect because the contents of _get_configured_remotes and _get_configured_branches is the same. Signed-off-by: Daniel Sangorrin --- scripts/kernel_sec/branch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kernel_sec/branch.py b/scripts/kernel_sec/branch.py index ae1ca2c..3ede64a 100644 --- a/scripts/kernel_sec/branch.py +++ b/scripts/kernel_sec/branch.py @@ -209,7 +209,7 @@ def get_remotes(mappings, mainline=None, stable=None): remotes = RemoteMap() remotes.update(_get_configured_remotes('conf/remotes.yml')) remotes.update( - _get_configured_branches( + _get_configured_remotes( os.path.expanduser('~/.config/kernel-sec/remotes.yml'))) for mapping in mappings: left, right = arg.split(':', 1)