diff options
| author | Jiri Denemark <jdenemar@redhat.com> | 2011-03-11 13:44:20 +0100 |
|---|---|---|
| committer | Jiri Denemark <jdenemar@redhat.com> | 2011-03-14 14:07:57 +0100 |
| commit | 79d090d8ba62507f6b688254fe7586e62c6caea5 (patch) | |
| tree | debacf129ad55b53003a8681441e0d1cc47634c6 | |
| parent | 1e025b834b7f5cdd677d29a6c78e3edbecc839a4 (diff) | |
| download | libvirt-python-v6-libvirt-0.8.7-18.el6_1.4.tar.gz libvirt-python-v6-libvirt-0.8.7-18.el6_1.4.tar.xz libvirt-python-v6-libvirt-0.8.7-18.el6_1.4.zip | |
python: Use hardcoded python path in libvirt.pylibvirt-0.8.7-18.el6_1.5libvirt-0.8.7-18.el6_1.4libvirt-0.8.7-18.el6_1.3libvirt-0.8.7-18.el6_1.2libvirt-0.8.7-18.el6_1.1libvirt-0.8.7-18.el6libvirt-0.8.7-17.el6libvirt-0.8.7-16.el6libvirt-0.8.7-15.el6libvirt-0.8.7-14.el6libvirt-0.8.7-13.el6RHEL-6.1-zRHEL-6.1
https://bugzilla.redhat.com/show_bug.cgi?id=684204
This partially reverts (and fixes that part in a different way) commit
e4384459c93e3e786aa483c7f077d1d22148f689, which replaced
``/usr/bin/python'' with ``/usr/bin/env python'' in all examples or
scripts used during build to generate other files.
However, python bindings module is compiled and linked against a
specific python discovered or explicitly provided in configure phase.
Thus libvirt.py, which is generated and installed into the system,
should use the same python binary for which the module has been built.
The hunk in Makefile.am replaces $(srcdir) with $(PYTHON), which might
seem wrong but it is not. generator.py didn't use any of its command
line arguments so passing $(srcdir) to it was redundant.
(cherry picked from commit c51f08272af7a1a890ccf10d421b8948777c3a33)
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | generator.py | 7 | ||||
| -rw-r--r-- | libvirt-override.py | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index eda2866..432ad70 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,7 @@ GENERATED= libvirt-export.c \ libvirt.py generated.stamp: $(srcdir)/$(GENERATE) $(API_DESC) - $(PYTHON) $(srcdir)/$(GENERATE) $(srcdir) + $(PYTHON) $(srcdir)/$(GENERATE) $(PYTHON) touch $@ $(GENERATED): generated.stamp diff --git a/generator.py b/generator.py index 15751bd..2d4f942 100755 --- a/generator.py +++ b/generator.py @@ -14,6 +14,11 @@ import re if __name__ == "__main__": # launched as a script srcPref = os.path.dirname(sys.argv[0]) + if len(sys.argv) > 1: + python = sys.argv[1] + else: + print "Python binary not specified" + sys.exit(1) else: # imported srcPref = os.path.dirname(__file__) @@ -1010,7 +1015,7 @@ def buildWrappers(): classes = open("libvirt.py", "w") extra = open(os.path.join(srcPref,"libvirt-override.py"), "r") - classes.write("#!/usr/bin/env python\n") + classes.write("#! " + python + " -i\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 909ebe3..d544a0e 100644 --- a/libvirt-override.py +++ b/libvirt-override.py @@ -2,11 +2,6 @@ # 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 |