From 236e81b10f81dc2133300d2879231c0faa470f58 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 1 Jun 2017 10:58:43 +0200 Subject: [PATCH] Update to 3 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + ...print-downloading-packages-only-once.patch | 47 ------- 0002-do-not-fail-on-empty-transactions.patch | 129 ------------------ microdnf.spec | 11 +- sources | 2 +- 5 files changed, 8 insertions(+), 182 deletions(-) delete mode 100644 0001-print-downloading-packages-only-once.patch delete mode 100644 0002-do-not-fail-on-empty-transactions.patch diff --git a/.gitignore b/.gitignore index fbbd9ae..d94681d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /microdnf-1.tar.gz /microdnf-2.tar.gz +/microdnf-3.tar.gz diff --git a/0001-print-downloading-packages-only-once.patch b/0001-print-downloading-packages-only-once.patch deleted file mode 100644 index bb6a306..0000000 --- a/0001-print-downloading-packages-only-once.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 15837579fef30f1e8fe1aa3017eb5441caf3f09c Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Fri, 17 Feb 2017 21:46:28 +0100 -Subject: [PATCH 1/2] print downloading packages only once - -Signed-off-by: Igor Gnatenko ---- - dnf/dnf-main.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/dnf/dnf-main.c b/dnf/dnf-main.c -index 610ad74..6473bb3 100644 ---- a/dnf/dnf-main.c -+++ b/dnf/dnf-main.c -@@ -29,6 +29,7 @@ - static gboolean opt_yes = TRUE; - static gboolean opt_nodocs = FALSE; - static gboolean show_help = FALSE; -+static gboolean dl_pkgs_printed = FALSE; - - static gboolean - process_global_option (const gchar *option_name, -@@ -115,8 +116,11 @@ state_action_changed_cb (DnfState *state, - g_print("Downloading metadata...\n"); - break; - case DNF_STATE_ACTION_DOWNLOAD_PACKAGES: -- g_print("Downloading: %s (%u%%)\n", action_hint, -- dnf_state_get_percentage (state)); -+ if (!dl_pkgs_printed) -+ { -+ g_print("Downloading packages...\n"); -+ dl_pkgs_printed = TRUE; -+ } - break; - case DNF_STATE_ACTION_TEST_COMMIT: - g_print("Running transaction test...\n"); -@@ -141,6 +145,7 @@ state_action_changed_cb (DnfState *state, - break; - case DNF_STATE_ACTION_CLEANUP: - g_print("Cleanup: %s\n", action_hint); -+ break; - default: - break; - } --- -2.12.2 - diff --git a/0002-do-not-fail-on-empty-transactions.patch b/0002-do-not-fail-on-empty-transactions.patch deleted file mode 100644 index bb29792..0000000 --- a/0002-do-not-fail-on-empty-transactions.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 5b9caacf40e20e74298da29b0e5de525096c0e13 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sat, 4 Mar 2017 16:56:43 +0100 -Subject: [PATCH 2/2] do not fail on empty transactions - -Closes: https://github.com/rpm-software-management/microdnf/issues/3 -Signed-off-by: Igor Gnatenko ---- - dnf/dnf-utils.c | 16 +++++++++------- - dnf/dnf-utils.h | 4 ++-- - dnf/plugins/install/dnf-command-install.c | 5 +++-- - dnf/plugins/update/dnf-command-update.c | 5 +++-- - 4 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/dnf/dnf-utils.c b/dnf/dnf-utils.c -index 16f4d08..b3d087c 100644 ---- a/dnf/dnf-utils.c -+++ b/dnf/dnf-utils.c -@@ -2,7 +2,7 @@ - * - * Copyright © 2010-2015 Richard Hughes - * Copyright © 2016 Colin Walters -- * Copyright © 2016 Igor Gnatenko -+ * Copyright © 2016-2017 Igor Gnatenko - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -20,7 +20,7 @@ - - #include "dnf-utils.h" - --void -+gboolean - dnf_utils_print_transaction (DnfContext *ctx) - { - g_autoptr(GPtrArray) pkgs = dnf_goal_get_packages (dnf_context_get_goal (ctx), -@@ -30,16 +30,18 @@ dnf_utils_print_transaction (DnfContext *ctx) - DNF_PACKAGE_INFO_UPDATE, - DNF_PACKAGE_INFO_REMOVE, - -1); -- g_print ("Transaction: "); -+ - if (pkgs->len == 0) -- g_print ("(empty)"); -- else -- g_print ("%u packages", pkgs->len); -- g_print ("\n"); -+ { -+ g_print ("Nothing to do.\n"); -+ return FALSE; -+ } -+ g_print ("Transaction: %u packages\n", pkgs->len); - - for (guint i = 0; i < pkgs->len; i++) - { - DnfPackage *pkg = pkgs->pdata[i]; - g_print ("%s (%s)\n", dnf_package_get_nevra (pkg), dnf_package_get_reponame (pkg)); - } -+ return TRUE; - } -diff --git a/dnf/dnf-utils.h b/dnf/dnf-utils.h -index d649109..f894800 100644 ---- a/dnf/dnf-utils.h -+++ b/dnf/dnf-utils.h -@@ -1,7 +1,7 @@ - /* dnf-utils.h - * - * Copyright © 2016 Colin Walters -- * Copyright © 2016 Igor Gnatenko -+ * Copyright © 2016-2017 Igor Gnatenko - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -24,6 +24,6 @@ - - G_BEGIN_DECLS - --void dnf_utils_print_transaction (DnfContext *ctx); -+gboolean dnf_utils_print_transaction (DnfContext *ctx); - - G_END_DECLS -diff --git a/dnf/plugins/install/dnf-command-install.c b/dnf/plugins/install/dnf-command-install.c -index 6f27768..ea549da 100644 ---- a/dnf/plugins/install/dnf-command-install.c -+++ b/dnf/plugins/install/dnf-command-install.c -@@ -2,7 +2,7 @@ - * - * Copyright © 2010-2015 Richard Hughes - * Copyright © 2016 Colin Walters -- * Copyright © 2016 Igor Gnatenko -+ * Copyright © 2016-2017 Igor Gnatenko - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -75,7 +75,8 @@ dnf_command_install_run (DnfCommand *cmd, - } - if (!dnf_goal_depsolve (dnf_context_get_goal (ctx), DNF_INSTALL, error)) - return FALSE; -- dnf_utils_print_transaction (ctx); -+ if (!dnf_utils_print_transaction (ctx)) -+ return TRUE; - if (!dnf_context_run (ctx, NULL, error)) - return FALSE; - g_print ("Complete.\n"); -diff --git a/dnf/plugins/update/dnf-command-update.c b/dnf/plugins/update/dnf-command-update.c -index 33f7974..652d902 100644 ---- a/dnf/plugins/update/dnf-command-update.c -+++ b/dnf/plugins/update/dnf-command-update.c -@@ -1,6 +1,6 @@ - /* dnf-command-update.c - * -- * Copyright © 2016 Igor Gnatenko -+ * Copyright © 2016-2017 Igor Gnatenko - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -73,7 +73,8 @@ dnf_command_update_run (DnfCommand *cmd, - - if (!dnf_goal_depsolve (dnf_context_get_goal (ctx), 0, error)) - return FALSE; -- dnf_utils_print_transaction (ctx); -+ if (!dnf_utils_print_transaction (ctx)) -+ return TRUE; - if (!dnf_context_run (ctx, NULL, error)) - return FALSE; - g_print ("Complete.\n"); --- -2.12.2 - diff --git a/microdnf.spec b/microdnf.spec index 317764e..1be65d0 100644 --- a/microdnf.spec +++ b/microdnf.spec @@ -7,23 +7,21 @@ %endif Name: microdnf -Version: 2 -Release: 3%{?dist} +Version: 3 +Release: 1%{?dist} Summary: Micro DNF License: GPLv3+ URL: https://github.com/rpm-software-management/microdnf Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0001: 0001-print-downloading-packages-only-once.patch -Patch0002: 0002-do-not-fail-on-empty-transactions.patch - BuildRequires: gcc BuildRequires: %{buildsys_req} BuildRequires: pkgconfig(glib-2.0) >= 2.44.0 BuildRequires: pkgconfig(gobject-2.0) >= 2.44.0 BuildRequires: pkgconfig(libpeas-1.0) >= 1.20.0 BuildRequires: pkgconfig(libdnf) >= 0.7.0 +BuildRequires: pkgconfig(smartcols) %description %{summary}. @@ -58,6 +56,9 @@ popd %{_bindir}/%{name} %changelog +* Thu Jun 01 2017 Igor Gnatenko - 3-1 +- Update to 3 + * Fri May 12 2017 Igor Gnatenko - 2-3 - Apply few patches from upstream diff --git a/sources b/sources index bb931f4..c159c26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (microdnf-2.tar.gz) = 739d6984723e08c46037a89410e177ec76875d5c934d7e3656ef2a103628b0f70a397d20f856af40dae42884c21c6c7b9245cc1fb06363dbce4182c53691369b +SHA512 (microdnf-3.tar.gz) = 47835fa7f3a7c97cb744612448d85f4f0443e2f3d516170d2ede421e8b36472b5b77d15629c5f77e630d7afbf4cb45053570038f14d06253017578110815e80d