diff options
author | Matthias Bolte <matthias.bolte@googlemail.com> | 2010-11-13 16:34:57 +0100 |
---|---|---|
committer | Matthias Bolte <matthias.bolte@googlemail.com> | 2010-11-14 22:45:59 +0100 |
commit | 1e025b834b7f5cdd677d29a6c78e3edbecc839a4 (patch) | |
tree | e2a099a5c2f2482dbc4c9b9bfe5a57e739a9274a | |
parent | 84399ee7efcead19285540d410a183ad3e088527 (diff) | |
download | libvirt-python-1e025b834b7f5cdd677d29a6c78e3edbecc839a4.tar.gz |
Use python discovered through env instead of hardcoding a pathv0.8.7v0.8.6libvirt-0.8.7-9.el6libvirt-0.8.7-8.el6libvirt-0.8.7-7.el6libvirt-0.8.7-6.el6libvirt-0.8.7-5.el6libvirt-0.8.7-11.el6libvirt-0.8.7-10.el6
This is more flexible regarding the location of the python binary
but doesn't allow to pass the -u flag. The -i flag can be passed
from inside the script using the PYTHONINSPECT env variable.
This fixes a problem with the esx_vi_generator.py on FreeBSD.
-rwxr-xr-x | generator.py | 2 | ||||
-rw-r--r-- | libvirt-override.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/generator.py b/generator.py index 68009b9..15751bd 100755 --- a/generator.py +++ b/generator.py @@ -1010,7 +1010,7 @@ def buildWrappers(): classes = open("libvirt.py", "w") extra = open(os.path.join(srcPref,"libvirt-override.py"), "r") - classes.write("#!/usr/bin/python -i\n") + classes.write("#!/usr/bin/env python\n") classes.write("#\n") classes.write("# WARNING WARNING WARNING WARNING\n") classes.write("#\n") diff --git a/libvirt-override.py b/libvirt-override.py index d544a0e..909ebe3 100644 --- a/libvirt-override.py +++ b/libvirt-override.py @@ -2,6 +2,11 @@ # Manually written part of python bindings for libvirt # +# Specify -i commandline option after python was started +if __name__ == "__main__": + import os + os.environ["PYTHONINSPECT"] = "1" + # On cygwin, the DLL is called cygvirtmod.dll try: import libvirtmod |