Merge branch 'topic/christian/plugin-deactivation-bugfix' of https://…

…github.com/ckreibich/package-manager

* 'topic/christian/plugin-deactivation-bugfix' of https://github.com/ckreibich/package-manager:
  Bugfix: incorrect arguments to Manager.has_plugin()

CHANGES

@@ -1,4 +1,8 @@
 
+2.0.3-2 | 2019-08-28 15:49:54 -0700
+
+  * Bugfix: incorrect arguments to Manager.has_plugin() (Christian Kreibich, Corelight)
+
 2.0.3 | 2019-08-26 14:18:12 -0700
 
   * Release 2.0.3.

VERSION

@@ -1 +1 @@
-2.0.3
+2.0.3-2

doc/man/zkg.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "ZKG" "1" "Aug 26, 2019" "2.0.3" "Zeek Package Manager"
+.TH "ZKG" "1" "Aug 28, 2019" "2.0.3-2" "Zeek Package Manager"
 .SH NAME
 zkg \- Zeek Package Manager
 .

zeekpkg/__init__.py

@@ -9,7 +9,7 @@
 
 import logging
 
-__version__ = "2.0.3"
+__version__ = "2.0.3-2"
 __all__ = ['manager', 'package', 'source']
 
 LOG = logging.getLogger(__name__)

zeekpkg/manager.py

@@ -1022,7 +1022,7 @@ def load(self, pkg_path):
 
         if (not os.path.exists(pkg_load_script) and
             not os.path.exists(pkg_load_fallback) and
-            not self.has_plugin(self, ipkg)):
+            not self.has_plugin(ipkg)):
             LOG.debug('loading "%s": %s not found and package has no plugin',
                       pkg_path, pkg_load_script)
             return 'no __load__.zeek within package script_dir and no plugin included'