From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 420F913888F for ; Tue, 6 Oct 2015 15:31:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01A5721C02A; Tue, 6 Oct 2015 15:31:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8ED7521C042 for ; Tue, 6 Oct 2015 15:31:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C149A340B4C for ; Tue, 6 Oct 2015 15:31:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFCA3AD7 for ; Tue, 6 Oct 2015 15:31:26 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1444142862.41658d890d2aeffdd0c7c399883ae212a1ea3ae0.vapier@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/embedded.py catalyst/targets/netboot.py catalyst/targets/netboot2.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 41658d890d2aeffdd0c7c399883ae212a1ea3ae0 X-VCS-Branch: master Date: Tue, 6 Oct 2015 15:31:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a24cc03b-8556-468d-a452-17aa623c64cf X-Archives-Hash: 65bafff134dfdee1ebc7998fcede2b22 commit: 41658d890d2aeffdd0c7c399883ae212a1ea3ae0 Author: Mike Frysinger gentoo org> AuthorDate: Tue Oct 6 14:47:42 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Oct 6 14:47:42 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=41658d89 targets: fix bad set_build_kernel_vars call These modules were calling set_build_kernel_vars with an argument that the func didn't accept. Plus, it's redundant as the super class init (which these guys call) already handles the call. So delete it. catalyst/targets/embedded.py | 1 - catalyst/targets/netboot.py | 1 - catalyst/targets/netboot2.py | 1 - 3 files changed, 3 deletions(-) diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py index 3309278..6044e17 100644 --- a/catalyst/targets/embedded.py +++ b/catalyst/targets/embedded.py @@ -28,7 +28,6 @@ class embedded(StageBase): self.valid_values.append("embedded/fs-ops") StageBase.__init__(self,spec,addlargs) - self.set_build_kernel_vars(addlargs) def set_action_sequence(self): self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\ diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py index b0e322c..46ec4eb 100644 --- a/catalyst/targets/netboot.py +++ b/catalyst/targets/netboot.py @@ -44,7 +44,6 @@ class netboot(StageBase): raise CatalystError("configuration error in netboot/packages.") StageBase.__init__(self,spec,addlargs) - self.set_build_kernel_vars(addlargs) if "netboot/busybox_config" in addlargs: file_locate(self.settings, ["netboot/busybox_config"]) diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py index f2d039c..5508367 100644 --- a/catalyst/targets/netboot2.py +++ b/catalyst/targets/netboot2.py @@ -46,7 +46,6 @@ class netboot2(StageBase): raise CatalystError("configuration error in netboot2/packages.") StageBase.__init__(self,spec,addlargs) - self.set_build_kernel_vars() self.settings["merge_path"]=normpath("/tmp/image/") def set_target_path(self):