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

apply-live: Print a package diff

Browse Source 
The cool thing about this is it emphasizes how "integrated" apply-live
is versus the uncontrolled `rpm-ostree usroverlay`.  We're still
tracking the state of things reliably and can print it.
This commit is contained in:
Colin Walters 2020-12-22 22:12:43 +00:00 committed by OpenShift Merge Robot
parent 4c3d3fcb45
commit 485dbe8472
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/app/rpmostree-builtin-livefs.cxx
View File

@ -26,6 +26,7 @@
#include "rpmostree-ex-builtins.h"
#include "rpmostree-libbuiltin.h"
#include "rpmostree-dbus-helpers.h"
#include "rpmostree-rust.h"
#include <libglnx.h>
@ -110,6 +111,46 @@ rpmostree_ex_builtin_livefs (int argc,
error))
return FALSE;
/* TODO - we compute all this client side right now for multiple reasons.
* - The diff printing code all lives on the client right now
* - We don't bind `rpmostree_output_message()` into Rust yet
* - We've historically accessed RPM diffs client side
*/
g_autoptr(OstreeSysroot) sysroot = ostree_sysroot_new_default ();
if (!ostree_sysroot_load (sysroot, cancellable, error))
return FALSE;
g_autoptr(OstreeRepo) repo = NULL;
if (!ostree_sysroot_get_repo (sysroot, &repo, cancellable, error))
return FALSE;
OstreeDeployment *booted_deployment = ostree_sysroot_get_booted_deployment (sysroot);
g_assert (booted_deployment);
const char *booted_commit = ostree_deployment_get_csum (booted_deployment);
g_autofree char *live_replaced = NULL;
if (!ror_livefs_get_state (sysroot, booted_deployment, NULL, &live_replaced, error))
return FALSE;
g_assert (live_replaced);
gboolean have_target = FALSE;
if (!ostree_repo_has_object (repo, OSTREE_OBJECT_TYPE_COMMIT, live_replaced, &have_target, NULL, error))
return FALSE;
/* It might happen that the live target commit was GC'd somehow; we're not writing
* an explicit ref for it. In that case skip the diff.
*/
if (have_target)
{
g_autoptr(GPtrArray) removed = NULL;
g_autoptr(GPtrArray) added = NULL;
g_autoptr(GPtrArray) modified_old = NULL;
g_autoptr(GPtrArray) modified_new = NULL;
if (!rpm_ostree_db_diff (repo, booted_commit, live_replaced,
&removed, &added, &modified_old, &modified_new,
cancellable, error))
return FALSE;
rpmostree_diff_print_formatted (RPMOSTREE_DIFF_PRINT_FORMAT_FULL_MULTILINE, NULL, 0,
removed, added, modified_old, modified_new);
}
g_print ("Successfully updated running filesystem tree; some services may need to be restarted.\n");
return TRUE;

4
tests/vmcheck/test-livefs.sh
View File

@ -67,7 +67,9 @@ vm_rpmostree install bar
vm_assert_status_jq '.deployments|length == 2' \
'.deployments[0]["live-replaced"]|not' \
'.deployments[1]["live-replaced"]'
vm_rpmostree ex livefs
vm_rpmostree ex livefs | tee out.txt
assert_file_has_content out.txt 'Added:'
assert_file_has_content out.txt ' bar-1.0'
vm_cmd rpm -qa > rpmq.txt
assert_file_has_content rpmq.txt bar-1.0-1
assert_not_file_has_content rpmq.txt foo-1.0-1