From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 13 Apr 2013 08:10:37 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/libvirt
X-Git-Tag: libvirt-1.0.4-2~1
X-Git-Url: http://git.onelab.eu/?p=libvirt.git;a=commitdiff_plain;h=ea90ff32b53b5e89271b7df67496c9fcb42a58f4;hp=073836af20f631824688b6beef2ebeb790fb074f

Merge branch 'master' of ssh://git.onelab.eu/git/libvirt
---

diff --git a/libvirt.spec b/libvirt.spec
index 7d671d1..52393fe 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -384,6 +384,7 @@ URL: http://libvirt.org/
     %define mainturl stable_updates/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
+Patch1: virgetlasterror.patch
 
 %if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}
@@ -1114,6 +1115,7 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %if ! %{with_xen}
diff --git a/virgetlasterror.patch b/virgetlasterror.patch
new file mode 100644
index 0000000..9109d58
--- /dev/null
+++ b/virgetlasterror.patch
@@ -0,0 +1,11 @@
+--- a/python/libvirt-override.py	2013-04-13 09:47:03.000000000 +0200
++++ b/python/libvirt-override.py	2013-04-13 09:49:07.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+         # Never call virConnGetLastError().
+         # virGetLastError() is now thread local
+-        err = virGetLastError()
++        err = libvirtmod.virGetLastError()
+         if err is None:
+             msg = defmsg
+         else: