folkslinux
/
microdnf
mirror of https://github.com/rpm-software-management/microdnf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add option best for transactions (RhBug:1679476) 

It adds option `--best` plus default is handled from libdnf.conf and
dnf.conf

https://bugzilla.redhat.com/show_bug.cgi?id=1679476
This commit is contained in:
Jaroslav Mracek 2019-10-23 13:14:45 +02:00 committed by Neal Gompa (ニール・ゴンパ)
parent 9956d1dcdd
commit 2be521af42
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dnf/dnf-main.c
View File

@ -28,6 +28,7 @@
static gboolean opt_yes = TRUE;
static gboolean opt_nodocs = FALSE;
static gboolean opt_best = FALSE;
static gboolean show_help = FALSE;
static gboolean dl_pkgs_printed = FALSE;
static GSList *enable_disable_repos = NULL;
@ -82,6 +83,7 @@ process_global_option (const gchar *option_name,
static const GOptionEntry global_opts[] = {
{ "assumeyes", 'y', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &opt_yes, "Does nothing, we always assume yes", NULL },
{ "best", '\0', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, &opt_best, "Try the best available package versions in transactions", NULL },
{ "disablerepo", '\0', G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, process_global_option, "Disable repository by an id", "ID" },
{ "enablerepo", '\0', G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, process_global_option, "Enable repository by an id", "ID" },
{ "nodocs", '\0', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, &opt_nodocs, "Install packages without docs", NULL },
@ -283,7 +285,10 @@ main (int argc,
dnf_transaction_set_flags (txn, flags);
}
if (!show_help && opt_best)
{
dnf_context_set_best(opt_best);
}
/*
* The first non-option is the command.
* Get it and remove it from arguments.

7
dnf/plugins/install/dnf-command-install.c
View File

@ -73,7 +73,12 @@ dnf_command_install_run (DnfCommand *cmd,
if (!dnf_context_install (ctx, *pkg, error))
return FALSE;
}
if (!dnf_goal_depsolve (dnf_context_get_goal (ctx), DNF_INSTALL, error))
DnfGoalActions flags = DNF_INSTALL;
if (dnf_context_get_best())
{
flags |= DNF_FORCE_BEST;
}
if (!dnf_goal_depsolve (dnf_context_get_goal (ctx), flags, error))
return FALSE;
if (!dnf_utils_print_transaction (ctx))
return TRUE;

8
dnf/plugins/update/dnf-command-update.c
View File

@ -70,8 +70,12 @@ dnf_command_update_run (DnfCommand *cmd,
return FALSE;
}
}
if (!dnf_goal_depsolve (dnf_context_get_goal (ctx), 0, error))
DnfGoalActions flags = 0;
if (dnf_context_get_best())
{
flags |= DNF_FORCE_BEST;
}
if (!dnf_goal_depsolve (dnf_context_get_goal (ctx), flags, error))
return FALSE;
if (!dnf_utils_print_transaction (ctx))
return TRUE;