File do-not-load-pip-state-if-there-is-no-3rd-party-... of Package py27-compat-salt

Overview Repositories Revisions Requests Users Attributes Meta

File do-not-load-pip-state-if-there-is-no-3rd-party-depen.patch of Package py27-compat-salt (Revision 342e47d61f6ff62171e1c0bf4b373daf)

Currently displaying revision 342e47d61f6ff62171e1c0bf4b373daf , Show latest

From 3d5d89428ca333caa2c2259f679f8fffd7110ba6 Mon Sep 17 00:00:00 2001
From: Bo Maryniuk <bo@suse.de>
Date: Fri, 21 Sep 2018 17:31:39 +0200
Subject: [PATCH] Do not load pip state if there is no 3rd party
 dependencies

Safe import 3rd party dependency
---
 salt/modules/pip.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/salt/modules/pip.py b/salt/modules/pip.py
index 0a0773a8f4..f19593ed1a 100644
--- a/salt/modules/pip.py
+++ b/salt/modules/pip.py
@@ -82,7 +82,10 @@ from __future__ import absolute_import, print_function, unicode_literals
 # Import python libs
 import logging
 import os
-import pkg_resources
+try:
+    import pkg_resources
+except ImportError:
+    pkg_resources = None
 import re
 import shutil
 import sys
@@ -121,7 +124,12 @@ def __virtual__():
     entire filesystem.  If it's not installed in a conventional location, the
     user is required to provide the location of pip each time it is used.
     '''
-    return 'pip'
+    if pkg_resources is None:
+        ret = False, 'Package dependency "pkg_resource" is missing'
+    else:
+        ret = 'pip'
+
+    return ret
 
 
 def _pip_bin_env(cwd, bin_env):
-- 
2.16.4

Places

File do-not-load-pip-state-if-there-is-no-3rd-party-depen.patch of Package py27-compat-salt (Revision 342e47d61f6ff62171e1c0bf4b373daf)

Places