diff options
author | Cole Robinson <crobinso@redhat.com> | 2014-03-22 19:14:07 -0400 |
---|---|---|
committer | Cole Robinson <crobinso@redhat.com> | 2014-03-25 13:37:02 -0400 |
commit | 115760f6f03ca5fd67b01176e325aceaecb08fe6 (patch) | |
tree | 795ac11134b3ceb9e291eab04cb4eabc7747cdce /setup.py | |
parent | cac45e1b1c0d92d6aba4133b2c95d0798c57c098 (diff) | |
download | libvirt-python-115760f6f03ca5fd67b01176e325aceaecb08fe6.tar.gz |
setup.py: Make have_libvirt_lxc a function
This means we call it twice for a build operation, but I don't think
that's a big deal.
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -34,13 +34,14 @@ spawn([pkgcfg, "--atleast-version=%s" % MIN_LIBVIRT, "libvirt"]) -have_libvirt_lxc=True -try: - spawn([pkgcfg, - "--atleast-version=%s" % MIN_LIBVIRT_LXC, - "libvirt"]) -except DistutilsExecError: - have_libvirt_lxc=False +def have_libvirt_lxc(): + try: + spawn([pkgcfg, + "--atleast-version=%s" % MIN_LIBVIRT_LXC, + "libvirt"]) + return True + except DistutilsExecError: + return False def get_pkgconfig_data(args, mod, required=True): """Run pkg-config to and return content associated with it""" @@ -106,7 +107,7 @@ def get_module_lists(): c_modules.append(moduleqemu) py_modules.append("libvirt_qemu") - if have_libvirt_lxc: + if have_libvirt_lxc(): modulelxc = Extension('libvirtmod_lxc', sources = ['libvirt-lxc-override.c', 'build/libvirt-lxc.c', 'typewrappers.c', 'libvirt-utils.c'], libraries = [ "virt-lxc" ], @@ -133,7 +134,7 @@ class my_build(build): self.spawn([sys.executable, "generator.py", "libvirt", apis[0]]) self.spawn([sys.executable, "generator.py", "libvirt-qemu", apis[1]]) - if have_libvirt_lxc: + if have_libvirt_lxc(): self.spawn([sys.executable, "generator.py", "libvirt-lxc", apis[2]]) build.run(self) |