forked from ungleich-public/cdist
Merge branch 'bugfix/in-script-import' into 'master'
Fix importing cdist module Closes #845 See merge request ungleich-public/cdist!957
This commit is contained in:
commit
d30cd5c2b2
1 changed files with 15 additions and 17 deletions
32
bin/cdist
32
bin/cdist
|
@ -25,25 +25,23 @@ import logging
|
|||
import os
|
||||
import sys
|
||||
|
||||
# try to import cdist and if that fails,
|
||||
# then add this file's parent dir to
|
||||
# module search path and try again.
|
||||
try:
|
||||
import cdist
|
||||
except ModuleNotFoundError:
|
||||
cdist_dir = os.path.realpath(
|
||||
os.path.join(
|
||||
os.path.dirname(os.path.realpath(__file__)),
|
||||
os.pardir))
|
||||
# See if this file's parent is cdist module
|
||||
# and if so add it to module search path.
|
||||
cdist_dir = os.path.realpath(
|
||||
os.path.join(
|
||||
os.path.dirname(os.path.realpath(__file__)),
|
||||
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)
|
||||
import cdist
|
||||
|
||||
import cdist.argparse
|
||||
import cdist.banner
|
||||
import cdist.config
|
||||
import cdist.install
|
||||
import cdist.shell
|
||||
import cdist.inventory
|
||||
import cdist # noqa 402
|
||||
import cdist.argparse # noqa 402
|
||||
import cdist.banner # noqa 402
|
||||
import cdist.config # noqa 402
|
||||
import cdist.install # noqa 402
|
||||
import cdist.shell # noqa 402
|
||||
import cdist.inventory # noqa 402
|
||||
|
||||
|
||||
def commandline():
|
||||
|
|
Loading…
Reference in a new issue