[gentoo-commits] proj/layman:master commit in: layman/

[Devan Franchini]

commit:     ba4a302400a01aa9c524cfe0cb5c6a0af1b0f010
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 22:05:54 2015 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 22:05:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/layman.git/commit/?id=ba4a3024

argsparser.py: Fixes default override of protocol_order config option

 layman/argsparser.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/layman/argsparser.py b/layman/argsparser.py
index a12b95a..44b2ca4 100644
--- a/layman/argsparser.py
+++ b/layman/argsparser.py
@@ -358,7 +358,17 @@ class ArgsParser(BareConfig):
                 storage = self.options[key]
             if storage:
                 return storage
-                
+
+        if key == 'protocol_order':
+            protocol_order = []
+            if (key in self.options.keys()
+                and not self.options[key] is None):
+                protocol_order = self.options[key]
+            if self.config.has_option('MAIN', 'protocol_order'):
+                protocol_order = self.config.get('MAIN', 'protocol_order')
+            if protocol_order:
+                return protocol_order
+
         if key == 'overlays':
             overlays = ''
             if (key in self.options.keys()