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

core: update some comments re. relabeling

Browse Source 
Closes: #475
Approved by: jlebon
This commit is contained in:
Jonathan Lebon 2016-10-05 17:24:29 -04:00 committed by Atomic Bot
parent dbbe8d0687
commit 485d170c25
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libpriv/rpmostree-core.c
View File

@ -1561,8 +1561,6 @@ relabel_one_package (OstreeRepo *repo,
g_autofree char *cachebranch = rpmostree_get_cache_branch_pkg (pkg); g_autofree char *cachebranch = rpmostree_get_cache_branch_pkg (pkg);
gboolean changed = FALSE; gboolean changed = FALSE;
/* let's just use the branch head */
if (!ostree_repo_resolve_rev (repo, cachebranch, FALSE, if (!ostree_repo_resolve_rev (repo, cachebranch, FALSE,
&commit_csum, error)) &commit_csum, error))
goto out; goto out;
@ -1592,14 +1590,6 @@ relabel_one_package (OstreeRepo *repo,
cancellable, error)) cancellable, error))
goto out; goto out;
/* XXX: 'changed' now holds whether the policy change actually affected any of
* our labels. If it didn't, then we shouldn't have to recommit, which we do
* right now unconditionally. Related to the XXX below, maybe we can keep the
* list of compatible sepolicy csums in the tree directly under e.g.
* /meta/sepolicy/. Make them individual files rather than a single file so
* that they can more easily be GC'ed by "refcounting" each sepolicy depending
* on the current deployments. */
if (!ostree_repo_prepare_transaction (repo, NULL, cancellable, error)) if (!ostree_repo_prepare_transaction (repo, NULL, cancellable, error))
goto out; goto out;
@ -1630,7 +1620,7 @@ relabel_one_package (OstreeRepo *repo,
if (!ostree_repo_load_commit (repo, commit_csum, &commit_var, NULL, error)) if (!ostree_repo_load_commit (repo, commit_csum, &commit_var, NULL, error))
goto out; goto out;
/* let's just copy the metadata from the head and only change the /* let's just copy the metadata from the previous commit and only change the
* rpmostree.sepolicy value */ * rpmostree.sepolicy value */
{ {
g_autoptr(GVariant) meta = g_variant_get_child_value (commit_var, 0); g_autoptr(GVariant) meta = g_variant_get_child_value (commit_var, 0);