[gentoo-commits] proj/R_overlay:master commit in: roverlay/config/

[André Erdmann]

commit:     7224fec5b78c8ac4c2c52d5615cc8ea42726c8a2
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Aug 23 17:15:50 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Aug 23 17:15:50 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7224fec5

config loader, yesno(): use str_to_bool()

---
 roverlay/config/loader.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/roverlay/config/loader.py b/roverlay/config/loader.py
index f5d28d8..76c73b0 100644
--- a/roverlay/config/loader.py
+++ b/roverlay/config/loader.py
@@ -17,7 +17,7 @@ import re
 import shlex
 import os.path
 
-from roverlay.strutil         import unquote
+from roverlay.strutil         import unquote, str_to_bool
 from roverlay.config          import fielddef
 from roverlay.config.util     import get_config_path
 from roverlay.config.entrymap import CONFIG_ENTRY_MAP
@@ -365,15 +365,12 @@ class ConfigLoader ( object ):
          arguments:
          * val --
          """
-         if not val is None:
-            to_check = str ( val ).lower()
-            if to_check in [ 'y', 'yes', '1', 'true', 'enabled', 'on' ]:
-               return 1
-            elif to_check in [ 'n', 'no', '0', 'false', 'disabled', 'off' ]:
-               return 0
-
-         self.logger.warning ( str(val) + " is not a valid yesno value." )
-         return -1
+         ret = str_to_bool ( val, nofail=True )
+         if ret is None:
+            self.logger.warning ( str(val) + " is not a valid yesno value." )
+            return -1
+         else:
+            return int(ret)
       # --- end of yesno (...) ---
 
       def fs_path ( val ):