Merge branch 'deb_build' into develop
Minor setup corrections
This commit is contained in:
commit
0d6d20e106
5
setup.py
5
setup.py
@ -37,6 +37,11 @@ setupOpts = dict(
|
|||||||
from distutils.core import setup
|
from distutils.core import setup
|
||||||
import distutils.dir_util
|
import distutils.dir_util
|
||||||
import os, sys, re
|
import os, sys, re
|
||||||
|
try:
|
||||||
|
# just avoids warning about install_requires
|
||||||
|
import setuptools
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
path = os.path.split(__file__)[0]
|
path = os.path.split(__file__)[0]
|
||||||
sys.path.insert(0, os.path.join(path, 'tools'))
|
sys.path.insert(0, os.path.join(path, 'tools'))
|
||||||
|
@ -1,5 +1,16 @@
|
|||||||
import os, sys, re
|
import os, sys, re
|
||||||
from subprocess import check_output
|
try:
|
||||||
|
from subprocess import check_output
|
||||||
|
except ImportError:
|
||||||
|
import subprocess as sp
|
||||||
|
def check_output(*args, **kwds):
|
||||||
|
kwds['stdout'] = sp.PIPE
|
||||||
|
proc = sp.Popen(*args, **kwds)
|
||||||
|
output = proc.stdout.read()
|
||||||
|
proc.wait()
|
||||||
|
if proc.returncode != 0:
|
||||||
|
raise Exception("Process had nonzero return value", proc.returncode)
|
||||||
|
return output
|
||||||
|
|
||||||
def listAllPackages(pkgroot):
|
def listAllPackages(pkgroot):
|
||||||
path = os.getcwd()
|
path = os.getcwd()
|
||||||
|
Loading…
Reference in New Issue
Block a user