[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, master, updated. debian/0.4.6-7-2-gdbc4da6

[Guido Guenther]

The following commit has been merged in the master branch:
commit e771da9edad9b5d74199cd442f27de2d4ade7a14
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Dec 5 09:22:43 2008 +0100

    drop superflous 0011-Fix-segfault-on-missing-volume-format.patch
    
    not an issue in 0.4.6 only in 0.5.X

diff --git a/debian/patches/0011-Fix-segfault-on-missing-volume-format.patch b/debian/patches/0011-Fix-segfault-on-missing-volume-format.patch
deleted file mode 100644
index 2a7eb9a..0000000
--- a/debian/patches/0011-Fix-segfault-on-missing-volume-format.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9533ab9556ddf15435944ec03f6ab1730fb2e279 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard at redhat.com>
-Date: Thu, 4 Dec 2008 16:26:31 +0100
-Subject: [PATCH] Fix segfault on missing volume format
-
-Closes: #507677
----
- src/storage_conf.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/src/storage_conf.c b/src/storage_conf.c
-index f0d2b94..c22889f 100644
---- a/src/storage_conf.c
-+++ b/src/storage_conf.c
-@@ -752,6 +752,11 @@ virStorageVolDefParseDoc(virConnectPtr conn,
-     ret->target.path = virXPathString(conn, "string(/volume/target/path)", ctxt);
-     if (options->formatFromString) {
-         char *format = virXPathString(conn, "string(/volume/target/format/@type)", ctxt);
-+        if (format == NULL) {
-+            virStorageReportError(conn, VIR_ERR_XML_ERROR,
-+                          _("cannot guess missing format type for target"));
-+            goto cleanup;
-+        }
-         if ((ret->target.format = (options->formatFromString)(conn, format)) < 0) {
-             virStorageReportError(conn, VIR_ERR_XML_ERROR,
-                                   _("unknown volume format type %s"), format);
--- 
-1.6.0.3
-
diff --git a/debian/patches/series b/debian/patches/series
index 3ccb952..b8b43aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@
 0008-Increase-initial-qemu-monitor-read-timeout.patch
 0009-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch
 0010-raise-error-on-invalid-volume-format.patch
-0011-Fix-segfault-on-missing-volume-format.patch

-- 
Libvirt debian packaging