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

app: Rename pkg-delete -> pkg-remove and unify codebase

Browse Source 
I've found it's a lot less code to have multiple builtins share live
in the same `.c` file where they can share things like options.

Also, rename `pkg-delete` -> `pkg-remove` since the canonical antonym
of `add` is `remove`.

Closes: #345
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-06-22 21:14:27 -04:00 committed by Atomic Bot
parent c53d8fa9cb
commit 1616ca5f07
5 changed files with 84 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile-rpm-ostree.am
View File

@ -27,8 +27,7 @@ rpm_ostree_SOURCES = src/app/main.c \
src/app/rpmostree-builtin-rollback.c \
src/app/rpmostree-builtin-deploy.c \
src/app/rpmostree-builtin-rebase.c \
src/app/rpmostree-builtin-pkgadd.c \
src/app/rpmostree-builtin-pkgdelete.c \
src/app/rpmostree-pkg-builtins.c \
src/app/rpmostree-builtin-status.c \
src/app/rpmostree-builtin-internals.c \
src/app/rpmostree-builtin-container.c \

2
src/app/main.c
View File

@ -40,7 +40,7 @@ static RpmOstreeCommand commands[] = {
{ "db", rpmostree_builtin_db },
{ "deploy", rpmostree_builtin_deploy },
{ "pkg-add", rpmostree_builtin_pkg_add },
{ "pkg-delete", rpmostree_builtin_pkg_delete },
{ "pkg-remove", rpmostree_builtin_pkg_remove },
{ "rebase", rpmostree_builtin_rebase },
{ "rollback", rpmostree_builtin_rollback },
{ "status", rpmostree_builtin_status },

136
src/app/rpmostree-builtin-pkgdelete.c
View File

@ -1,136 +0,0 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
*
* Copyright (C) 2015 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 "rpmostree-builtins.h"
#include "rpmostree-libbuiltin.h"
#include "rpmostree-rpm-util.h"
#include "rpmostree-dbus-helpers.h"
#include <libglnx.h>
static char *opt_osname;
static gboolean opt_reboot;
static gboolean opt_dry_run;
static gboolean opt_no_scripts;
static GOptionEntry option_entries[] = {
{ "os", 0, 0, G_OPTION_ARG_STRING, &opt_osname, "Operate on provided OSNAME", "OSNAME" },
{ "reboot", 'r', 0, G_OPTION_ARG_NONE, &opt_reboot, "Initiate a reboot after upgrade is prepared", NULL },
{ "dry-run", 'n', 0, G_OPTION_ARG_NONE, &opt_dry_run, "Exit after printing the transaction", NULL },
{ "noscripts", 0, 0, G_OPTION_ARG_NONE, &opt_no_scripts, "Do not run scripts", NULL },
{ NULL }
};
static GVariant *
get_args_variant (void)
{
GVariantDict dict;
g_variant_dict_init (&dict, NULL);
g_variant_dict_insert (&dict, "reboot", "b", opt_reboot);
g_variant_dict_insert (&dict, "dry-run", "b", opt_dry_run);
if (opt_no_scripts)
g_variant_dict_insert (&dict, "noscripts", "b", TRUE);
return g_variant_dict_end (&dict);
}
int
rpmostree_builtin_pkg_delete (int argc,
char **argv,
GCancellable *cancellable,
GError **error)
{
int exit_status = EXIT_FAILURE;
GOptionContext *context;
glnx_unref_object RPMOSTreeOS *os_proxy = NULL;
glnx_unref_object RPMOSTreeSysroot *sysroot_proxy = NULL;
g_autoptr(GVariant) default_deployment = NULL;
g_autofree char *transaction_address = NULL;
int i;
g_autoptr(GPtrArray) argv_empty = g_ptr_array_new ();
g_autoptr(GPtrArray) argv_and_null = g_ptr_array_new ();
context = g_option_context_new ("PACKAGE [PACKAGE...] - Remove previously layered RPM packages");
if (!rpmostree_option_context_parse (context,
option_entries,
&argc, &argv,
RPM_OSTREE_BUILTIN_FLAG_NONE,
cancellable,
&sysroot_proxy,
error))
goto out;
if (argc < 2)
{
rpmostree_usage_error (context, "At least one PACKAGE must be specified", error);
goto out;
}
for (i = 1; i < argc; i++)
g_ptr_array_add (argv_and_null, argv[i]);
g_ptr_array_add (argv_and_null, NULL);
g_ptr_array_add (argv_empty, NULL);
if (!rpmostree_load_os_proxy (sysroot_proxy, opt_osname,
cancellable, &os_proxy, error))
goto out;
if (!rpmostree_os_call_pkg_change_sync (os_proxy,
get_args_variant (),
(const char * const*)argv_empty->pdata,
(const char * const*)argv_and_null->pdata,
&transaction_address,
cancellable,
error))
goto out;
if (!rpmostree_transaction_get_response_sync (sysroot_proxy,
transaction_address,
cancellable,
error))
goto out;
if (opt_dry_run)
{
g_print ("Exiting because of '--dry-run' option\n");
}
else if (!opt_reboot)
{
const char *sysroot_path = rpmostree_sysroot_get_path (sysroot_proxy);
if (!rpmostree_print_treepkg_diff_from_sysroot_path (sysroot_path,
cancellable,
error))
goto out;
g_print ("Run \"systemctl reboot\" to start a reboot\n");
}
exit_status = EXIT_SUCCESS;
out:
/* Does nothing if using the message bus. */
rpmostree_cleanup_peer ();
return exit_status;
}

2
src/app/rpmostree-builtins.h
View File

@ -51,7 +51,7 @@ BUILTINPROTO(db);
BUILTINPROTO(internals);
BUILTINPROTO(container);
BUILTINPROTO(pkg_add);
BUILTINPROTO(pkg_delete);
BUILTINPROTO(pkg_remove);
#undef BUILTINPROTO

115
src/app/rpmostree-builtin-pkgadd.c → src/app/rpmostree-pkg-builtins.c
View File

@ -52,44 +52,23 @@ get_args_variant (void)
return g_variant_dict_end (&dict);
}
int
rpmostree_builtin_pkg_add (int argc,
char **argv,
GCancellable *cancellable,
GError **error)
static int
pkg_change (RPMOSTreeSysroot *sysroot_proxy,
const char *const* packages_to_add,
const char *const* packages_to_remove,
GCancellable *cancellable,
GError **error)
{
int exit_status = EXIT_FAILURE;
GOptionContext *context;
glnx_unref_object RPMOSTreeOS *os_proxy = NULL;
glnx_unref_object RPMOSTreeSysroot *sysroot_proxy = NULL;
g_autoptr(GVariant) default_deployment = NULL;
g_autofree char *transaction_address = NULL;
int i;
g_autoptr(GPtrArray) argv_empty = g_ptr_array_new ();
g_autoptr(GPtrArray) argv_and_null = g_ptr_array_new ();
const char *const strv_empty[] = { NULL };
context = g_option_context_new ("PACKAGE [PACKAGE...] - Download and install layered RPM packages");
if (!rpmostree_option_context_parse (context,
option_entries,
&argc, &argv,
RPM_OSTREE_BUILTIN_FLAG_NONE,
cancellable,
&sysroot_proxy,
error))
goto out;
if (argc < 2)
{
rpmostree_usage_error (context, "At least one PACKAGE must be specified", error);
goto out;
}
for (i = 1; i < argc; i++)
g_ptr_array_add (argv_and_null, argv[i]);
g_ptr_array_add (argv_and_null, NULL);
g_ptr_array_add (argv_empty, NULL);
if (!packages_to_add)
packages_to_add = strv_empty;
if (!packages_to_remove)
packages_to_remove = strv_empty;
if (!rpmostree_load_os_proxy (sysroot_proxy, opt_osname,
cancellable, &os_proxy, error))
@ -97,8 +76,8 @@ rpmostree_builtin_pkg_add (int argc,
if (!rpmostree_os_call_pkg_change_sync (os_proxy,
get_args_variant (),
(const char * const*)argv_and_null->pdata,
(const char * const*)argv_empty->pdata,
packages_to_add,
packages_to_remove,
&transaction_address,
cancellable,
error))
@ -137,3 +116,71 @@ out:
return exit_status;
}
int
rpmostree_builtin_pkg_add (int argc,
char **argv,
GCancellable *cancellable,
GError **error)
{
GOptionContext *context;
glnx_unref_object RPMOSTreeSysroot *sysroot_proxy = NULL;
g_autoptr(GPtrArray) packages_to_add = g_ptr_array_new ();
context = g_option_context_new ("PACKAGE [PACKAGE...] - Download and install layered RPM packages");
if (!rpmostree_option_context_parse (context,
option_entries,
&argc, &argv,
RPM_OSTREE_BUILTIN_FLAG_NONE,
cancellable,
&sysroot_proxy,
error))
return EXIT_FAILURE;
if (argc < 2)
{
rpmostree_usage_error (context, "At least one PACKAGE must be specified", error);
return EXIT_FAILURE;
}
for (int i = 1; i < argc; i++)
g_ptr_array_add (packages_to_add, argv[i]);
g_ptr_array_add (packages_to_add, NULL);
return pkg_change (sysroot_proxy, (const char *const*)packages_to_add->pdata, NULL, cancellable, error);
}
int
rpmostree_builtin_pkg_remove (int argc,
char **argv,
GCancellable *cancellable,
GError **error)
{
GOptionContext *context;
glnx_unref_object RPMOSTreeSysroot *sysroot_proxy = NULL;
g_autoptr(GPtrArray) packages_to_remove = g_ptr_array_new ();
context = g_option_context_new ("PACKAGE [PACKAGE...] - Remove one or more overlay packages");
if (!rpmostree_option_context_parse (context,
option_entries,
&argc, &argv,
RPM_OSTREE_BUILTIN_FLAG_NONE,
cancellable,
&sysroot_proxy,
error))
return EXIT_FAILURE;
if (argc < 2)
{
rpmostree_usage_error (context, "At least one PACKAGE must be specified", error);
return EXIT_FAILURE;
}
for (int i = 1; i < argc; i++)
g_ptr_array_add (packages_to_remove, argv[i]);
g_ptr_array_add (packages_to_remove, NULL);
return pkg_change (sysroot_proxy, NULL, (const char *const*)packages_to_remove->pdata, cancellable, error);
}