keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unpacker: Fix logic error regression in previous commit

Browse Source 
I spotted this warning go by in the build logs.  Let's make it
fatal from now on.

Closes: #536
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-12-06 14:22:54 -05:00 committed by Atomic Bot
parent 90fc84fb24
commit 977835fd41
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -35,6 +35,7 @@ CC_CHECK_FLAGS_APPEND([WARN_CFLAGS], [CFLAGS], [\
-Werror=pointer-arith -Werror=init-self \ -Werror=pointer-arith -Werror=init-self \
-Werror=missing-declarations \ -Werror=missing-declarations \
-Werror=return-type \ -Werror=return-type \
-Werror=parenthesis \
-Werror=overflow \ -Werror=overflow \
-Werror=int-conversion \ -Werror=int-conversion \
-Werror=missing-include-dirs -Werror=aggregate-return \ -Werror=missing-include-dirs -Werror=aggregate-return \

4
src/libpriv/rpmostree-unpacker.c
View File

@ -590,8 +590,8 @@ compose_filter_cb (OstreeRepo *repo,
(void) get_rpmfi_override (self, path, &user, &group, NULL); (void) get_rpmfi_override (self, path, &user, &group, NULL);
/* First, look for non-root paths in /run and /var */ /* First, look for non-root paths in /run and /var */
if ((user != NULL || group != NULL) if ((user != NULL || group != NULL) &&
&& g_str_has_prefix (path, "/run/") || g_str_has_prefix (path, "/var/")) (g_str_has_prefix (path, "/run/") || g_str_has_prefix (path, "/var/")))
{ {
append_tmpfiles_d (self, path, file_info, user, group); append_tmpfiles_d (self, path, file_info, user, group);
return OSTREE_REPO_COMMIT_FILTER_SKIP; return OSTREE_REPO_COMMIT_FILTER_SKIP;