Merge remote-tracking branch 'origin/topic/vlad/user_var_fix'

* origin/topic/vlad/user_var_fix: Revert erroneous indentation introduced in previous commit. Add fallback option to getting user_vars. Fixes #55
zeek · Oct 14, 2019 · 77a1419 · 77a1419
2 parents 544fed4 + e301965
commit 77a1419
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,13 @@
 
+2.0.6-3 | 2019-10-14 11:53:46 -0700
+
+  * GH-55: Add fallback option to getting user_vars. (Vlad Grigorescu)
+
+    This generally fixes errors when installing packages that use "user_vars",
+    but the user's zkg config file doesn't have a corresponding key.  And that
+    can happen simply by (separately) installing multiple packages that each
+    use "user_vars".
+
 2.0.6 | 2019-09-20 13:06:48 -0700
 
   * Release 2.0.6.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.6
+2.0.6-3
diff --git a/doc/man/zkg.1 b/doc/man/zkg.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "ZKG" "1" "Sep 20, 2019" "2.0.6" "Zeek Package Manager"
+.TH "ZKG" "1" "Oct 14, 2019" "2.0.6-3" "Zeek Package Manager"
 .SH NAME
 zkg \- Zeek Package Manager
 .

diff --git a/zeekpkg/__init__.py b/zeekpkg/__init__.py
@@ -9,7 +9,7 @@
 
 import logging
 
-__version__ = "2.0.6"
+__version__ = "2.0.6-3"
 __all__ = ['manager', 'package', 'source']
 
 LOG = logging.getLogger(__name__)

diff --git a/zkg b/zkg
@@ -92,7 +92,7 @@ def prompt_for_user_vars(manager, config, configfile, force, pkg_infos):
                 from_env = True
             else:
                 if config.has_section('user_vars'):
-                    v = config.get('user_vars', key)
+                    v = config.get('user_vars', key, fallback=None)
 
                     if v:
                         default_value = v