|
 |
e2ee2c |
From 5b9caacf40e20e74298da29b0e5de525096c0e13 Mon Sep 17 00:00:00 2001
|
|
|
e2ee2c |
From: Igor Gnatenko <ignatenko@redhat.com>
|
|
|
e2ee2c |
Date: Sat, 4 Mar 2017 16:56:43 +0100
|
|
|
e2ee2c |
Subject: [PATCH 3/3] do not fail on empty transactions
|
|
|
e2ee2c |
|
|
|
e2ee2c |
Closes: https://github.com/rpm-software-management/microdnf/issues/3
|
|
|
e2ee2c |
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
|
|
|
e2ee2c |
---
|
|
|
e2ee2c |
dnf/dnf-utils.c | 16 +++++++++-------
|
|
|
e2ee2c |
dnf/dnf-utils.h | 4 ++--
|
|
|
e2ee2c |
dnf/plugins/install/dnf-command-install.c | 5 +++--
|
|
|
e2ee2c |
dnf/plugins/update/dnf-command-update.c | 5 +++--
|
|
|
e2ee2c |
4 files changed, 17 insertions(+), 13 deletions(-)
|
|
|
e2ee2c |
|
|
|
e2ee2c |
diff --git a/dnf/dnf-utils.c b/dnf/dnf-utils.c
|
|
|
e2ee2c |
index 16f4d08..b3d087c 100644
|
|
|
e2ee2c |
--- a/dnf/dnf-utils.c
|
|
|
e2ee2c |
+++ b/dnf/dnf-utils.c
|
|
|
e2ee2c |
@@ -2,7 +2,7 @@
|
|
|
e2ee2c |
*
|
|
|
e2ee2c |
* Copyright © 2010-2015 Richard Hughes <richard@hughsie.com>
|
|
|
e2ee2c |
* Copyright © 2016 Colin Walters <walters@verbum.org>
|
|
|
e2ee2c |
- * Copyright © 2016 Igor Gnatenko <ignatenko@redhat.com>
|
|
|
e2ee2c |
+ * Copyright © 2016-2017 Igor Gnatenko <ignatenko@redhat.com>
|
|
|
e2ee2c |
*
|
|
|
e2ee2c |
* This program is free software: you can redistribute it and/or modify
|
|
|
e2ee2c |
* it under the terms of the GNU General Public License as published by
|
|
|
e2ee2c |
@@ -20,7 +20,7 @@
|
|
|
e2ee2c |
|
|
|
e2ee2c |
#include "dnf-utils.h"
|
|
|
e2ee2c |
|
|
|
e2ee2c |
-void
|
|
|
e2ee2c |
+gboolean
|
|
|
e2ee2c |
dnf_utils_print_transaction (DnfContext *ctx)
|
|
|
e2ee2c |
{
|
|
|
e2ee2c |
g_autoptr(GPtrArray) pkgs = dnf_goal_get_packages (dnf_context_get_goal (ctx),
|
|
|
e2ee2c |
@@ -30,16 +30,18 @@ dnf_utils_print_transaction (DnfContext *ctx)
|
|
|
e2ee2c |
DNF_PACKAGE_INFO_UPDATE,
|
|
|
e2ee2c |
DNF_PACKAGE_INFO_REMOVE,
|
|
|
e2ee2c |
-1);
|
|
|
e2ee2c |
- g_print ("Transaction: ");
|
|
|
e2ee2c |
+
|
|
|
e2ee2c |
if (pkgs->len == 0)
|
|
|
e2ee2c |
- g_print ("(empty)");
|
|
|
e2ee2c |
- else
|
|
|
e2ee2c |
- g_print ("%u packages", pkgs->len);
|
|
|
e2ee2c |
- g_print ("\n");
|
|
|
e2ee2c |
+ {
|
|
|
e2ee2c |
+ g_print ("Nothing to do.\n");
|
|
|
e2ee2c |
+ return FALSE;
|
|
|
e2ee2c |
+ }
|
|
|
e2ee2c |
+ g_print ("Transaction: %u packages\n", pkgs->len);
|
|
|
e2ee2c |
|
|
|
e2ee2c |
for (guint i = 0; i < pkgs->len; i++)
|
|
|
e2ee2c |
{
|
|
|
e2ee2c |
DnfPackage *pkg = pkgs->pdata[i];
|
|
|
e2ee2c |
g_print ("%s (%s)\n", dnf_package_get_nevra (pkg), dnf_package_get_reponame (pkg));
|
|
|
e2ee2c |
}
|
|
|
e2ee2c |
+ return TRUE;
|
|
|
e2ee2c |
}
|
|
|
e2ee2c |
diff --git a/dnf/dnf-utils.h b/dnf/dnf-utils.h
|
|
|
e2ee2c |
index d649109..f894800 100644
|
|
|
e2ee2c |
--- a/dnf/dnf-utils.h
|
|
|
e2ee2c |
+++ b/dnf/dnf-utils.h
|
|
|
e2ee2c |
@@ -1,7 +1,7 @@
|
|
|
e2ee2c |
/* dnf-utils.h
|
|
|
e2ee2c |
*
|
|
|
e2ee2c |
* Copyright © 2016 Colin Walters <walters@verbum.org>
|
|
|
e2ee2c |
- * Copyright © 2016 Igor Gnatenko <ignatenko@redhat.com>
|
|
|
e2ee2c |
+ * Copyright © 2016-2017 Igor Gnatenko <ignatenko@redhat.com>
|
|
|
e2ee2c |
*
|
|
|
e2ee2c |
* This program is free software: you can redistribute it and/or modify
|
|
|
e2ee2c |
* it under the terms of the GNU General Public License as published by
|
|
|
e2ee2c |
@@ -24,6 +24,6 @@
|
|
|
e2ee2c |
|
|
|
e2ee2c |
G_BEGIN_DECLS
|
|
|
e2ee2c |
|
|
|
e2ee2c |
-void dnf_utils_print_transaction (DnfContext *ctx);
|
|
|
e2ee2c |
+gboolean dnf_utils_print_transaction (DnfContext *ctx);
|
|
|
e2ee2c |
|
|
|
e2ee2c |
G_END_DECLS
|
|
|
e2ee2c |
diff --git a/dnf/plugins/install/dnf-command-install.c b/dnf/plugins/install/dnf-command-install.c
|
|
|
e2ee2c |
index 6f27768..ea549da 100644
|
|
|
e2ee2c |
--- a/dnf/plugins/install/dnf-command-install.c
|
|
|
e2ee2c |
+++ b/dnf/plugins/install/dnf-command-install.c
|
|
|
e2ee2c |
@@ -2,7 +2,7 @@
|
|
|
e2ee2c |
*
|
|
|
e2ee2c |
* Copyright © 2010-2015 Richard Hughes <richard@hughsie.com>
|
|
|
e2ee2c |
* Copyright © 2016 Colin Walters <walters@verbum.org>
|
|
|
e2ee2c |
- * Copyright © 2016 Igor Gnatenko <ignatenko@redhat.com>
|
|
|
e2ee2c |
+ * Copyright © 2016-2017 Igor Gnatenko <ignatenko@redhat.com>
|
|
|
e2ee2c |
*
|
|
|
e2ee2c |
* This program is free software: you can redistribute it and/or modify
|
|
|
e2ee2c |
* it under the terms of the GNU General Public License as published by
|
|
|
e2ee2c |
@@ -75,7 +75,8 @@ dnf_command_install_run (DnfCommand *cmd,
|
|
|
e2ee2c |
}
|
|
|
e2ee2c |
if (!dnf_goal_depsolve (dnf_context_get_goal (ctx), DNF_INSTALL, error))
|
|
|
e2ee2c |
return FALSE;
|
|
|
e2ee2c |
- dnf_utils_print_transaction (ctx);
|
|
|
e2ee2c |
+ if (!dnf_utils_print_transaction (ctx))
|
|
|
e2ee2c |
+ return TRUE;
|
|
|
e2ee2c |
if (!dnf_context_run (ctx, NULL, error))
|
|
|
e2ee2c |
return FALSE;
|
|
|
e2ee2c |
g_print ("Complete.\n");
|
|
|
e2ee2c |
diff --git a/dnf/plugins/update/dnf-command-update.c b/dnf/plugins/update/dnf-command-update.c
|
|
|
e2ee2c |
index 33f7974..652d902 100644
|
|
|
e2ee2c |
--- a/dnf/plugins/update/dnf-command-update.c
|
|
|
e2ee2c |
+++ b/dnf/plugins/update/dnf-command-update.c
|
|
|
e2ee2c |
@@ -1,6 +1,6 @@
|
|
|
e2ee2c |
/* dnf-command-update.c
|
|
|
e2ee2c |
*
|
|
|
e2ee2c |
- * Copyright © 2016 Igor Gnatenko <ignatenko@redhat.com>
|
|
|
e2ee2c |
+ * Copyright © 2016-2017 Igor Gnatenko <ignatenko@redhat.com>
|
|
|
e2ee2c |
*
|
|
|
e2ee2c |
* This program is free software: you can redistribute it and/or modify
|
|
|
e2ee2c |
* it under the terms of the GNU General Public License as published by
|
|
|
e2ee2c |
@@ -73,7 +73,8 @@ dnf_command_update_run (DnfCommand *cmd,
|
|
|
e2ee2c |
|
|
|
e2ee2c |
if (!dnf_goal_depsolve (dnf_context_get_goal (ctx), 0, error))
|
|
|
e2ee2c |
return FALSE;
|
|
|
e2ee2c |
- dnf_utils_print_transaction (ctx);
|
|
|
e2ee2c |
+ if (!dnf_utils_print_transaction (ctx))
|
|
|
e2ee2c |
+ return TRUE;
|
|
|
e2ee2c |
if (!dnf_context_run (ctx, NULL, error))
|
|
|
e2ee2c |
return FALSE;
|
|
|
e2ee2c |
g_print ("Complete.\n");
|
|
|
e2ee2c |
--
|
|
|
e2ee2c |
2.7.4
|
|
|
e2ee2c |
|