Merge branch 'issue_cdistpythonversion' of https://github.com/asteven/cdist
This commit is contained in:
commit
d286188a94
1 changed files with 7 additions and 5 deletions
12
bin/cdist
12
bin/cdist
|
@ -194,6 +194,13 @@ if __name__ == "__main__":
|
||||||
# Sys is needed for sys.exit()
|
# Sys is needed for sys.exit()
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
cdistpythonversion = '3.2'
|
||||||
|
if sys.version < cdistpythonversion:
|
||||||
|
print('Cdist requires Python >= ' + cdistpythonversion +
|
||||||
|
' on the source host.', file=sys.stderr)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
exit_code = 0
|
exit_code = 0
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -201,11 +208,6 @@ if __name__ == "__main__":
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
|
||||||
cdistpythonversion = '3.2'
|
|
||||||
if sys.version < cdistpythonversion:
|
|
||||||
raise cdist.Error('Cdist requires Python >= ' + cdistpythonversion +
|
|
||||||
' on the source host.')
|
|
||||||
|
|
||||||
# Ensure our /lib/ is included into PYTHON_PATH
|
# Ensure our /lib/ is included into PYTHON_PATH
|
||||||
sys.path.insert(0, os.path.abspath(
|
sys.path.insert(0, os.path.abspath(
|
||||||
os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib')))
|
os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib')))
|
||||||
|
|
Loading…
Reference in a new issue