mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
remove dep on importlib, the minion is now tested to work on 2.6
This commit is contained in:
parent
812abd6350
commit
733579709a
2 changed files with 2 additions and 3 deletions
|
@ -21,7 +21,7 @@ options=()
|
|||
source=("https://github.com/downloads/thatch45/salt/$pkgname-$pkgver.tar.gz"
|
||||
"salt-master"
|
||||
"salt-minion")
|
||||
md5sums=('93cc483021fbcc9920cb4daa3b2c36e2'
|
||||
md5sums=('26456860e89f53deaf75193da50b449a'
|
||||
'4baf45d1610d771b742de2cbd8951b9f'
|
||||
'11bc2e9042a5764e029fefbe49dddcc7')
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@ Routines to set up a minion
|
|||
# Import python libs
|
||||
import os
|
||||
import distutils.sysconfig
|
||||
import importlib
|
||||
import glob
|
||||
import re
|
||||
import time
|
||||
|
@ -63,7 +62,7 @@ class Minion(object):
|
|||
if self.opts['disable_modules'].count(mod):
|
||||
continue
|
||||
try:
|
||||
module = importlib.import_module('salt.modules.' + mod)
|
||||
__import__('salt.modules.' + mod, globals(), locals())
|
||||
module.__facter__ = self.opts['facter']
|
||||
except:
|
||||
continue
|
||||
|
|
Loading…
Add table
Reference in a new issue