refresh and enable debian/patches/backup-vma-correctly-propagate-error.patch

diff --git a/debian/patches/backup-vma-correctly-propagate-error.patch b/debian/patches/backup-vma-correctly-propagate-error.patch
index 74f2dc5b08255130f682efce4ab42e333690e3a3..a87f663e3ff78f4ac2f1a9e1234378997b31ed24 100644 (file)
--- a/debian/patches/backup-vma-correctly-propagate-error.patch
+++ b/debian/patches/backup-vma-correctly-propagate-error.patch
@@ -1,7 +1,7 @@
 Index: new/vma-writer.c
 ===================================================================
---- new.orig/vma-writer.c      2014-03-27 08:48:32.000000000 +0100
-+++ new/vma-writer.c   2014-03-27 08:48:33.000000000 +0100
+--- new.orig/vma-writer.c      2014-05-05 08:19:03.000000000 +0200
++++ new/vma-writer.c   2014-05-05 09:41:01.000000000 +0200
 @@ -797,6 +797,13 @@
      return transferred;
  }
@@ -18,8 +18,8 @@ Index: new/vma-writer.c
      g_assert(vmaw != NULL);
 Index: new/vma.h
 ===================================================================
---- new.orig/vma.h     2014-03-27 08:48:32.000000000 +0100
-+++ new/vma.h  2014-03-27 08:48:33.000000000 +0100
+--- new.orig/vma.h     2014-05-05 08:21:52.000000000 +0200
++++ new/vma.h  2014-05-05 09:41:01.000000000 +0200
 @@ -116,6 +116,7 @@
  
  VmaWriter *vma_writer_create(const char *filename, uuid_t uuid, Error **errp);
@@ -30,9 +30,9 @@ Index: new/vma.h
                            size_t len);
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-03-27 08:48:33.000000000 +0100
-+++ new/blockdev.c     2014-03-27 08:49:50.000000000 +0100
-@@ -1796,7 +1796,7 @@
+--- new.orig/blockdev.c        2014-05-05 09:40:22.000000000 +0200
++++ new/blockdev.c     2014-05-05 09:41:01.000000000 +0200
+@@ -1886,7 +1886,7 @@
                                 buf, &zero_bytes);
          if (ret < 0) {
              if (!backup_state.error) {

diff --git a/debian/patches/series b/debian/patches/series
index b6a9738b277f59a250ec99b396e9f31dca2a40c5..98aa6d7ae85780cb0e6f6dc98501caa8b19f33d5 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,7 +21,7 @@ backup-modify-job-api.patch
 backup-add-pve-monitor-commands.patch
 backup-add-dir-format.patch
 backup-do-not-return-errors-in-dump-callback.patch
-#backup-vma-correctly-propagate-error.patch
+backup-vma-correctly-propagate-error.patch
 #backup-vma-remove-async-queue.patch
 #internal-snapshot-async.patch
 #disable-efi-enable-pxe-roms.patch