Attachment 952139 Details for Bug 1156597 – proposed fix

[patch] proposed fix

0001-Fix-warning-when-unpacking-config-backup-tarball.patch (text/plain), 1.07 KB, created by Tomas Jelinek on 2014-10-30 13:57:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Jelinek

Created: 2014-10-30 13:57:47 UTC

Size: 1.07 KB

patch

obsolete

>From efe9326720ef809e94393f544fc53f4c63ee3ff3 Mon Sep 17 00:00:00 2001
>From: Tomas Jelinek <tojeline@redhat.com>
>Date: Thu, 30 Oct 2014 14:46:49 +0100
>Subject: [PATCH] Fix warning when unpacking config backup tarball
>
>---
> pcs/config.py | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/pcs/config.py b/pcs/config.py
>index 0c03b20..50d801c 100644
>--- a/pcs/config.py
>+++ b/pcs/config.py
>@@ -353,11 +353,11 @@ def config_backup_check_version(version):
>         utils.err("Cannot determine version of the backup")
> 
> def config_backup_add_version_to_tarball(tarball, version=None):
>-    version = version if version is not None else str(config_backup_version())
>-    version_info = tarfile.TarInfo("version.txt")
>-    version_info.size = len(version)
>-    version_info.type = tarfile.REGTYPE
>-    tarball.addfile(version_info, cStringIO.StringIO(version))
>+    return utils.tar_add_file_data(
>+        tarball,
>+        version if version is not None else str(config_backup_version()),
>+        "version.txt"
>+    )
> 
> def config_backup_version():
>     return 1
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 1156597: 952139