matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/in-script-import' into 'master'

Browse source 
Fix importing cdist module

Closes #845

See merge request ungleich-public/cdist!957
This commit is contained in:
poljakowski 2020-11-14 15:09:42 +01:00
commit d30cd5c2b2
1 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
bin/cdist
View file

@ -25,25 +25,23 @@ import logging
import os import os
import sys import sys
# try to import cdist and if that fails, # See if this file's parent is cdist module
# then add this file's parent dir to # and if so add it to module search path.
# module search path and try again. cdist_dir = os.path.realpath(
try:
import cdist
except ModuleNotFoundError:
cdist_dir = os.path.realpath(
os.path.join( os.path.join(
os.path.dirname(os.path.realpath(__file__)), os.path.dirname(os.path.realpath(__file__)),
os.pardir)) os.pardir))
cdist_init_dir = os.path.join(cdist_dir, 'cdist', '__init__.py')
if os.path.exists(cdist_init_dir):
sys.path.insert(0, cdist_dir) sys.path.insert(0, cdist_dir)
import cdist
import cdist.argparse import cdist # noqa 402
import cdist.banner import cdist.argparse # noqa 402
import cdist.config import cdist.banner # noqa 402
import cdist.install import cdist.config # noqa 402
import cdist.shell import cdist.install # noqa 402
import cdist.inventory import cdist.shell # noqa 402
import cdist.inventory # noqa 402
def commandline(): def commandline():