commit:     41658d890d2aeffdd0c7c399883ae212a1ea3ae0
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 14:47:42 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> 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):

Reply via email to