[sos] simplify SoSOptions.merge()

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/sos/__init__.py b/sos/__init__.py
index 3356e034..155c369d 100644
--- a/sos/__init__.py
+++ b/sos/__init__.py
@@ -188,11 +188,12 @@ class SoSOptions(object):
         for arg in _arg_names:
             if not hasattr(src, arg):
                 continue
+            if _is_seq(getattr(self, arg)):
+                self._merge_opt(arg, src, replace)
+                continue
             if arg in _arg_defaults.keys():
                 if replace or getattr(self, arg) == _arg_defaults[arg]:
                     self._merge_opt(arg, src, replace)
-            elif _is_seq(getattr(self, arg)):
-                self._merge_opt(arg, src, replace)
             else:
                 if replace or not getattr(self, arg):
                     self._merge_opt(arg, src, replace)