Attachment 881932 Details for Bug 1082832 – Reorganize the multilib method init to accept the full config.

[patch] Reorganize the multilib method init to accept the full config.

0001-Pass-the-config-object-into-the-multilib-method-obje.patch (text/plain), 4.09 KB, created by Ralph Bean on 2014-04-02 17:58:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Bean

Created: 2014-04-02 17:58:31 UTC

Size: 4.09 KB

patch

obsolete

>From 10ba88fc1c68d03b9da92fd8ce97b8f1cf21e1eb Mon Sep 17 00:00:00 2001
>From: Ralph Bean <rbean@redhat.com>
>Date: Wed, 2 Apr 2014 13:47:01 -0400
>Subject: [PATCH 1/2] Pass the config object into the multilib method objects.
>
>---
> mash/__init__.py | 18 ++++++++++--------
> mash/multilib.py | 25 ++++++++++++++-----------
> 2 files changed, 24 insertions(+), 19 deletions(-)
>
>diff --git a/mash/__init__.py b/mash/__init__.py
>index 997c0ce..1ffb436 100644
>--- a/mash/__init__.py
>+++ b/mash/__init__.py
>@@ -449,14 +449,16 @@ class Mash:
>         do_multi = self.config.multilib
>         
>         try:
>-            method = { 'base'    : multilib.MultilibMethod,
>-                       'devel'   : multilib.DevelMultilibMethod,
>-                       'file'    : multilib.FileMultilibMethod,
>-                       'kernel'  : multilib.KernelMultilibMethod,
>-                       'yaboot'  : multilib.YabootMultilibMethod,
>-                       'all'     : multilib.AllMultilibMethod,
>-                       'none'    : multilib.NoMultilibMethod,
>-                       'runtime' : multilib.RuntimeMultilibMethod}[self.config.multilib_method](self.config.multilib_file)
>+            method = {
>+                'base'    : multilib.MultilibMethod,
>+                'devel'   : multilib.DevelMultilibMethod,
>+                'file'    : multilib.FileMultilibMethod,
>+                'kernel'  : multilib.KernelMultilibMethod,
>+                'yaboot'  : multilib.YabootMultilibMethod,
>+                'all'     : multilib.AllMultilibMethod,
>+                'none'    : multilib.NoMultilibMethod,
>+                'runtime' : multilib.RuntimeMultilibMethod
>+            }[self.config.multilib_method](self.config)
>         except KeyError:
>             self.logger.error("Invalid multilib method %s" % (self.config.multilib_method,))
>             do_multi = False
>diff --git a/mash/multilib.py b/mash/multilib.py
>index 1224ce0..a9b3661 100644
>--- a/mash/multilib.py
>+++ b/mash/multilib.py
>@@ -14,7 +14,7 @@
> from fnmatch import fnmatch
> 
> class MultilibMethod:
>-    def __init__(self, dummy):
>+    def __init__(self, config):
>         self.name = 'base'
>     def select(self, po):
>         prefer_64 = [ 'gdb', 'frysk', 'systemtap', 'systemtap-runtime', 'ltrace', 'strace' ]
>@@ -28,21 +28,22 @@ class MultilibMethod:
>         return False
> 
> class NoMultilibMethod:
>-    def __init__(self, dummy):
>+    def __init__(self, config):
>         self.name = 'none'
>-        
>+
>     def select(self, po):
>         return False
> 
> class AllMultilibMethod(MultilibMethod):
>-    def __init__(self, dummy):
>+    def __init__(self, config):
>         self.name = 'all'
>-    
>+
>     def select(self, po):
>         return True
>     
> class FileMultilibMethod(MultilibMethod):
>-    def __init__(self, file):
>+    def __init__(self, config):
>+        file = config.multilib_file
>         self.name = 'file'
>         self.list = []
>         if file:
>@@ -61,8 +62,9 @@ class FileMultilibMethod(MultilibMethod):
>         return False
> 
> class KernelMultilibMethod:
>-    def __init__(self, dummy):
>+    def __init__(self, config):
>         self.name = 'base'
>+
>     def select(self, po):
>         if po.arch.find('64') != -1:
>             if po.name.startswith('kernel'):
>@@ -72,8 +74,9 @@ class KernelMultilibMethod:
>         return False
> 
> class YabootMultilibMethod:
>-    def __init__(self, dummy):
>+    def __init__(self, config):
>         self.name = 'base'
>+
>     def select(self, po):
>         if po.arch in ['ppc'] :
>             if po.name.startswith('yaboot'):
>@@ -81,9 +84,9 @@ class YabootMultilibMethod:
>         return False
> 
> class RuntimeMultilibMethod(MultilibMethod):
>-    def __init__(self, dummy):
>+    def __init__(self, config):
>         self.name = 'runtime'
>-    
>+
>     def select(self, po):
>         libdirs = [ '/usr/lib', '/usr/lib64', '/lib', '/lib64' ]
>         blacklist = [ 'tomcat-native' ]
>@@ -181,7 +184,7 @@ class RuntimeMultilibMethod(MultilibMethod):
>         return False
> 
> class DevelMultilibMethod(RuntimeMultilibMethod):
>-    def __init__(self, dummy):
>+    def __init__(self, config):
>         self.name = 'devel'
>     
>     def select(self, po):
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1082832: 881932 | 881933