[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.8.3-4-8-gca23484

[Guido Günther]

The following commit has been merged in the master branch:
commit 3d3f39561b1302da57e12f858e2815bde63fae8d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Dec 1 15:07:07 2010 +0100

    New patch 0012-penVZ-Fix-some-overwritten-error-codes.patch
    
    OpenVZ: Fix some overwritten error codes

diff --git a/debian/patches/0012-OpenVZ-Fix-some-overwritten-error-codes.patch b/debian/patches/0012-OpenVZ-Fix-some-overwritten-error-codes.patch
new file mode 100644
index 0000000..5c5b892
--- /dev/null
+++ b/debian/patches/0012-OpenVZ-Fix-some-overwritten-error-codes.patch
@@ -0,0 +1,55 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 1 Dec 2010 15:06:18 +0100
+Subject: [PATCH] OpenVZ: Fix some overwritten error codes
+
+Don't overwrite errors during domain creation/definition to ease
+tracking down problems.
+
+Origin: upstream, http://libvirt.org/git/?p=libvirt.git;a=commit;h=2d626c7d08b0b815155b93065d466ba89dfb82f7
+---
+ src/openvz/openvz_driver.c |   10 ++++------
+ 1 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
+index 556df52..698d0e6 100644
+--- a/src/openvz/openvz_driver.c
++++ b/src/openvz/openvz_driver.c
+@@ -57,6 +57,7 @@
+ #include "nodeinfo.h"
+ #include "memory.h"
+ #include "bridge.h"
++#include "logging.h"
+
+ #define VIR_FROM_THIS VIR_FROM_OPENVZ
+
+@@ -209,8 +210,7 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef)
+     else
+     {
+         if (openvzDomainDefineCmd(prog, OPENVZ_MAX_ARG, vmdef) < 0) {
+-            openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
+-                        _("Error creating command for container"));
++            VIR_ERROR0(_("Error creating command for container"));
+             goto cleanup;
+         }
+
+@@ -870,8 +870,7 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml)
+     vm->persistent = 1;
+
+     if (openvzSetInitialConfig(vm->def) < 0) {
+-        openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
+-                    _("Error creating initial configuration"));
++        VIR_ERROR0(_("Error creating initial configuration"));
+         goto cleanup;
+     }
+
+@@ -954,8 +953,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml,
+     vm->persistent = 1;
+
+     if (openvzSetInitialConfig(vm->def) < 0) {
+-        openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
+-                    _("Error creating initial configuration"));
++        VIR_ERROR0(_("Error creating initial configuration"));
+         goto cleanup;
+     }
+
+--
diff --git a/debian/patches/series b/debian/patches/series
index 16a59d5..2d056e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0009-Don-t-fail-lxc-domain-start-when-memory-controller-s.patch
 0010-nwfilter-resolve-deadlock-between-VM-operations-and-.patch
 0011-OpenVZ-take-veid-from-vmdef-name-when-defining-new-d.patch
+0012-OpenVZ-Fix-some-overwritten-error-codes.patch

-- 
Libvirt Debian packaging