rpms/ostree
5
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream version

Browse Source
This commit is contained in:
Colin Walters 2016-02-22 21:11:57 -05:00
parent 41d024c524
commit 14d6ecdd0f
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0001-lib-Two-more-compiler-warning-fixes.patch Normal file
View File

@ -0,0 +1,41 @@
From 61b4f268622e64610e14883367cbead18c716bc4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 22 Feb 2016 21:11:10 -0500
Subject: [PATCH] lib: Two more compiler warning fixes
---
src/libostree/ostree-repo-libarchive.c | 2 +-
src/libostree/ostree-repo.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c
index b21e222..1c05159 100644
--- a/src/libostree/ostree-repo-libarchive.c
+++ b/src/libostree/ostree-repo-libarchive.c
@@ -640,7 +640,7 @@ write_directory_to_libarchive_recurse (OstreeRepo *self,
if (r != bytes_read)
{
propagate_libarchive_error (error, a);
- g_prefix_error (error, "Failed to write %" G_GUINT64_FORMAT " bytes (code %" G_GUINT64_FORMAT"): ", (guint64)bytes_read, r);
+ g_prefix_error (error, "Failed to write %" G_GUINT64_FORMAT " bytes (code %" G_GUINT64_FORMAT"): ", (guint64)bytes_read, (guint64)r);
goto out;
}
}
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 1e9673d..3b08d44 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -4604,8 +4604,8 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
gs_free char *from = NULL;
gs_free char *to = NULL;
gs_free guchar *csum = NULL;
- gs_free char *superblock;
- gs_fd_close int superblock_file_fd;
+ gs_free char *superblock = NULL;
+ gs_fd_close int superblock_file_fd = -1;
g_autoptr(GInputStream) in_stream = NULL;
_ostree_parse_delta_name (delta_names->pdata[i], &from, &to);
--
1.8.3.1

1
ostree.spec
View File

@ -38,6 +38,7 @@ Requires: systemd-units
Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch
Patch3: 0001-libarchive-Fix-a-32-bit-format-warning.patch
Patch4: 0001-lib-Two-more-compiler-warning-fixes.patch
%description
OSTree is a tool for managing bootable, immutable, versioned