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

Print treepkgdiff on rollback too

Browse Source 
Move it to an internal API.
This commit is contained in:
Colin Walters 2014-03-28 21:40:30 -04:00
parent 3e3dd1f3ef
commit 50bd970791
5 changed files with 262 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-rpm-ostree.am
View File

@ -24,6 +24,8 @@ noinst_LTLIBRARIES += librpmostree.la
librpmostree_la_SOURCES = \
src/rpmostree-postprocess.c \
src/rpmostree-postprocess.h \
src/rpmostree-treepkgdiff.c \
src/rpmostree-treepkgdiff.h \
src/hif-utils.c \
src/hif-utils.h \
$(NULL)

10
src/rpmostree-builtin-rollback.c
View File

@ -24,6 +24,7 @@
#include <glib-unix.h>
#include "rpmostree-builtins.h"
#include "rpmostree-treepkgdiff.h"
#include "libgsystem.h"
@ -123,6 +124,15 @@ rpmostree_builtin_rollback (int argc,
gs_subprocess_simple_run_sync (NULL, GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT,
cancellable, error,
"systemctl", "reboot", NULL);
else
{
if (!rpmostree_print_treepkg_diff (sysroot, cancellable, error))
goto out;
g_print ("Sucessfully reset deployment order; run \"systemctl reboot\" to start a reboot\n");
}
if (opt_reboot)
ret = TRUE;
out:
return ret;

172
src/rpmostree-builtin-upgrade.c
View File

@ -24,15 +24,7 @@
#include <glib-unix.h>
#include "rpmostree-builtins.h"
#include <hawkey/packagelist.h>
#include <hawkey/query.h>
#include <hawkey/sack.h>
#include <hawkey/stringarray.h>
#include <hawkey/goal.h>
#include <hawkey/version.h>
#include <hawkey/util.h>
#include "hif-utils.h"
#include "rpmostree-treepkgdiff.h"
#include "libgsystem.h"
@ -93,155 +85,6 @@ pull_progress (OstreeAsyncProgress *progress,
g_string_free (buf, TRUE);
}
/* Todo: move this to libgsystem */
#define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func) \
static inline void func##p(type *p) { \
if (*p) \
func(*p); \
} \
struct __useless_struct_to_allow_trailing_semicolon__
DEFINE_TRIVIAL_CLEANUP_FUNC(HySack, hy_sack_free);
DEFINE_TRIVIAL_CLEANUP_FUNC(HyQuery, hy_query_free);
DEFINE_TRIVIAL_CLEANUP_FUNC(HyPackageList, hy_packagelist_free);
#define _cleanup_hysack_ __attribute__((cleanup(hy_sack_freep)))
#define _cleanup_hyquery_ __attribute__((cleanup(hy_query_freep)))
#define _cleanup_hypackagelist_ __attribute__((cleanup(hy_packagelist_freep)))
static gboolean
get_pkglist_for_root (GFile *root,
HySack *out_sack,
HyPackageList *out_pkglist,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
int rc;
_cleanup_hysack_ HySack sack = NULL;
_cleanup_hyquery_ HyQuery query = NULL;
_cleanup_hypackagelist_ HyPackageList pkglist = NULL;
sack = hy_sack_create (NULL, NULL, gs_file_get_path_cached (root), HY_MAKE_CACHE_DIR);
if (sack == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Failed to create sack cache");
goto out;
}
rc = hy_sack_load_system_repo (sack, NULL, HY_BUILD_CACHE);
if (!hif_rc_to_gerror (rc, error))
{
g_prefix_error (error, "Failed to load system repo: ");
goto out;
}
query = hy_query_create (sack);
hy_query_filter (query, HY_PKG_REPONAME, HY_EQ, HY_SYSTEM_REPO_NAME);
pkglist = hy_query_run (query);
ret = TRUE;
gs_transfer_out_value (out_sack, &sack);
gs_transfer_out_value (out_pkglist, &pkglist);
out:
return ret;
}
static gboolean
print_rpmdb_diff (GFile *oldroot,
GFile *newroot,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
_cleanup_hysack_ HySack old_sack = NULL;
_cleanup_hypackagelist_ HyPackageList old_pkglist = NULL;
_cleanup_hysack_ HySack new_sack = NULL;
_cleanup_hypackagelist_ HyPackageList new_pkglist = NULL;
guint i;
HyPackage pkg;
gboolean printed_header = FALSE;
if (!get_pkglist_for_root (oldroot, &old_sack, &old_pkglist,
cancellable, error))
goto out;
if (!get_pkglist_for_root (newroot, &new_sack, &new_pkglist,
cancellable, error))
goto out;
printed_header = FALSE;
FOR_PACKAGELIST(pkg, old_pkglist, i)
{
_cleanup_hyquery_ HyQuery query = NULL;
_cleanup_hypackagelist_ HyPackageList pkglist = NULL;
query = hy_query_create (new_sack);
hy_query_filter (query, HY_PKG_NAME, HY_EQ, hy_package_get_name (pkg));
hy_query_filter (query, HY_PKG_EVR, HY_NEQ, hy_package_get_evr (pkg));
hy_query_filter (query, HY_PKG_REPONAME, HY_EQ, HY_SYSTEM_REPO_NAME);
pkglist = hy_query_run (query);
if (hy_packagelist_count (pkglist) > 0)
{
gs_free char *nevra = hy_package_get_nevra (pkg);
if (!printed_header)
{
g_print ("Changed:\n");
printed_header = TRUE;
}
g_print (" %s\n", nevra);
}
}
printed_header = FALSE;
FOR_PACKAGELIST(pkg, old_pkglist, i)
{
_cleanup_hyquery_ HyQuery query = NULL;
_cleanup_hypackagelist_ HyPackageList pkglist = NULL;
query = hy_query_create (new_sack);
hy_query_filter (query, HY_PKG_NAME, HY_EQ, hy_package_get_name (pkg));
hy_query_filter (query, HY_PKG_REPONAME, HY_EQ, HY_SYSTEM_REPO_NAME);
pkglist = hy_query_run (query);
if (hy_packagelist_count (pkglist) == 0)
{
gs_free char *nevra = hy_package_get_nevra (pkg);
if (!printed_header)
{
g_print ("Removed:\n");
printed_header = TRUE;
}
g_print (" %s\n", nevra);
}
}
printed_header = FALSE;
FOR_PACKAGELIST(pkg, new_pkglist, i)
{
_cleanup_hyquery_ HyQuery query = NULL;
_cleanup_hypackagelist_ HyPackageList pkglist = NULL;
query = hy_query_create (old_sack);
hy_query_filter (query, HY_PKG_NAME, HY_EQ, hy_package_get_name (pkg));
hy_query_filter (query, HY_PKG_REPONAME, HY_EQ, HY_SYSTEM_REPO_NAME);
pkglist = hy_query_run (query);
if (hy_packagelist_count (pkglist) == 0)
{
gs_free char *nevra = hy_package_get_nevra (pkg);
if (!printed_header)
{
g_print ("Added:\n");
printed_header = TRUE;
}
g_print (" %s\n", nevra);
}
}
ret = TRUE;
out:
return ret;
}
gboolean
rpmostree_builtin_upgrade (int argc,
char **argv,
@ -310,18 +153,7 @@ rpmostree_builtin_upgrade (int argc,
"systemctl", "reboot", NULL);
else
{
gs_unref_object GFile *current_root = g_file_new_for_path ("/");
gs_unref_object GFile *new_root = NULL;
gs_unref_ptrarray GPtrArray *new_deployments =
ostree_sysroot_get_deployments (sysroot);
OstreeDeployment *new_deployment;
g_assert (new_deployments->len > 1);
new_deployment = new_deployments->pdata[0];
new_root = ostree_sysroot_get_deployment_directory (sysroot, new_deployment);
if (!print_rpmdb_diff (current_root, new_root,
cancellable, error))
if (!rpmostree_print_treepkg_diff (sysroot, cancellable, error))
goto out;
g_print ("Updates prepared for next boot; run \"systemctl reboot\" to start a reboot\n");

220
src/rpmostree-treepkgdiff.c Normal file
View File

@ -0,0 +1,220 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
*
* Copyright (C) 2014 Colin Walters <walters@verbum.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation; either version 2 of the licence or (at
* your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "string.h"
#include "rpmostree-treepkgdiff.h"
#include <ostree.h>
#include <hawkey/packagelist.h>
#include <hawkey/query.h>
#include <hawkey/sack.h>
#include <hawkey/stringarray.h>
#include <hawkey/goal.h>
#include <hawkey/version.h>
#include <hawkey/util.h>
#include "hif-utils.h"
#include "libgsystem.h"
/* Todo: move this to libgsystem */
#define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func) \
static inline void func##p(type *p) { \
if (*p) \
func(*p); \
} \
struct __useless_struct_to_allow_trailing_semicolon__
DEFINE_TRIVIAL_CLEANUP_FUNC(HySack, hy_sack_free);
DEFINE_TRIVIAL_CLEANUP_FUNC(HyQuery, hy_query_free);
DEFINE_TRIVIAL_CLEANUP_FUNC(HyPackageList, hy_packagelist_free);
#define _cleanup_hysack_ __attribute__((cleanup(hy_sack_freep)))
#define _cleanup_hyquery_ __attribute__((cleanup(hy_query_freep)))
#define _cleanup_hypackagelist_ __attribute__((cleanup(hy_packagelist_freep)))
static gboolean
get_pkglist_for_root (GFile *root,
HySack *out_sack,
HyPackageList *out_pkglist,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
int rc;
_cleanup_hysack_ HySack sack = NULL;
_cleanup_hyquery_ HyQuery query = NULL;
_cleanup_hypackagelist_ HyPackageList pkglist = NULL;
sack = hy_sack_create (NULL, NULL, gs_file_get_path_cached (root), HY_MAKE_CACHE_DIR);
if (sack == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Failed to create sack cache");
goto out;
}
rc = hy_sack_load_system_repo (sack, NULL, HY_BUILD_CACHE);
if (!hif_rc_to_gerror (rc, error))
{
g_prefix_error (error, "Failed to load system repo: ");
goto out;
}
query = hy_query_create (sack);
hy_query_filter (query, HY_PKG_REPONAME, HY_EQ, HY_SYSTEM_REPO_NAME);
pkglist = hy_query_run (query);
ret = TRUE;
gs_transfer_out_value (out_sack, &sack);
gs_transfer_out_value (out_pkglist, &pkglist);
out:
return ret;
}
static gboolean
print_rpmdb_diff (GFile *oldroot,
GFile *newroot,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
_cleanup_hysack_ HySack old_sack = NULL;
_cleanup_hypackagelist_ HyPackageList old_pkglist = NULL;
_cleanup_hysack_ HySack new_sack = NULL;
_cleanup_hypackagelist_ HyPackageList new_pkglist = NULL;
guint i;
HyPackage pkg;
gboolean printed_header = FALSE;
if (!get_pkglist_for_root (oldroot, &old_sack, &old_pkglist,
cancellable, error))
goto out;
if (!get_pkglist_for_root (newroot, &new_sack, &new_pkglist,
cancellable, error))
goto out;
printed_header = FALSE;
FOR_PACKAGELIST(pkg, old_pkglist, i)
{
_cleanup_hyquery_ HyQuery query = NULL;
_cleanup_hypackagelist_ HyPackageList pkglist = NULL;
query = hy_query_create (new_sack);
hy_query_filter (query, HY_PKG_NAME, HY_EQ, hy_package_get_name (pkg));
hy_query_filter (query, HY_PKG_EVR, HY_NEQ, hy_package_get_evr (pkg));
hy_query_filter (query, HY_PKG_REPONAME, HY_EQ, HY_SYSTEM_REPO_NAME);
pkglist = hy_query_run (query);
if (hy_packagelist_count (pkglist) > 0)
{
gs_free char *nevra = hy_package_get_nevra (pkg);
if (!printed_header)
{
g_print ("Changed:\n");
printed_header = TRUE;
}
g_print (" %s\n", nevra);
}
}
printed_header = FALSE;
FOR_PACKAGELIST(pkg, old_pkglist, i)
{
_cleanup_hyquery_ HyQuery query = NULL;
_cleanup_hypackagelist_ HyPackageList pkglist = NULL;
query = hy_query_create (new_sack);
hy_query_filter (query, HY_PKG_NAME, HY_EQ, hy_package_get_name (pkg));
hy_query_filter (query, HY_PKG_REPONAME, HY_EQ, HY_SYSTEM_REPO_NAME);
pkglist = hy_query_run (query);
if (hy_packagelist_count (pkglist) == 0)
{
gs_free char *nevra = hy_package_get_nevra (pkg);
if (!printed_header)
{
g_print ("Removed:\n");
printed_header = TRUE;
}
g_print (" %s\n", nevra);
}
}
printed_header = FALSE;
FOR_PACKAGELIST(pkg, new_pkglist, i)
{
_cleanup_hyquery_ HyQuery query = NULL;
_cleanup_hypackagelist_ HyPackageList pkglist = NULL;
query = hy_query_create (old_sack);
hy_query_filter (query, HY_PKG_NAME, HY_EQ, hy_package_get_name (pkg));
hy_query_filter (query, HY_PKG_REPONAME, HY_EQ, HY_SYSTEM_REPO_NAME);
pkglist = hy_query_run (query);
if (hy_packagelist_count (pkglist) == 0)
{
gs_free char *nevra = hy_package_get_nevra (pkg);
if (!printed_header)
{
g_print ("Added:\n");
printed_header = TRUE;
}
g_print (" %s\n", nevra);
}
}
ret = TRUE;
out:
return ret;
}
gboolean
rpmostree_print_treepkg_diff (OstreeSysroot *sysroot,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
OstreeDeployment *booted_deployment;
OstreeDeployment *new_deployment;
gs_unref_ptrarray GPtrArray *deployments =
ostree_sysroot_get_deployments (sysroot);
gs_unref_object GFile *booted_root = NULL;
gs_unref_object GFile *new_root = NULL;
booted_deployment = ostree_sysroot_get_booted_deployment (sysroot);
g_assert (booted_deployment);
g_assert (deployments->len > 1);
new_deployment = deployments->pdata[0];
if (new_deployment != booted_deployment)
{
booted_root = ostree_sysroot_get_deployment_directory (sysroot, booted_deployment);
new_root = ostree_sysroot_get_deployment_directory (sysroot, new_deployment);
if (!print_rpmdb_diff (booted_root, new_root, cancellable, error))
goto out;
}
ret = TRUE;
out:
return ret;
}

28
src/rpmostree-treepkgdiff.h Normal file
View File

@ -0,0 +1,28 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
*
* Copyright (C) 2014 Colin Walters <walters@verbum.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation; either version 2 of the licence or (at
* your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
#pragma once
#include <ostree.h>
gboolean
rpmostree_print_treepkg_diff (OstreeSysroot *sysroot,
GCancellable *cancellable,
GError **error);