diff --git a/dnf-1.1.2-2-to-dnf-1.1.2-3.patch b/dnf-1.1.2-2-to-dnf-1.1.2-3.patch new file mode 100644 index 0000000..dfafef5 --- /dev/null +++ b/dnf-1.1.2-2-to-dnf-1.1.2-3.patch @@ -0,0 +1,36 @@ +From ba21747031cac8abb690de907f226b78cc7a7cb0 Mon Sep 17 00:00:00 2001 +From: Michal Luscon +Date: Thu, 24 Sep 2015 11:22:49 +0200 +Subject: [PATCH] Automatic commit of package [dnf] release [1.1.2-3]. + +Revert "completion_helper: don't get IndexError (RhBug:1250038)" +--- + dnf/cli/cli.py | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py +index 034c28a..277176e 100644 +--- a/dnf/cli/cli.py ++++ b/dnf/cli/cli.py +@@ -1088,17 +1088,7 @@ class Cli(object): + 2 = we've got work yet to do, onto the next stage + """ + self._process_demands() +- classTuple = (dnf.cli.commands.ListCommand, +- dnf.cli.commands.repolist.RepoListCommand, +- dnf.cli.commands.clean.CleanCommand, +- dnf.cli.commands.HistoryCommand) +- if isinstance(self.command, classTuple): +- if len(self.base.extcmds) > 1: +- return self.command.run(self.base.extcmds) +- else: +- if len(self.base.extcmds) > 0: +- return self.command.run(self.base.extcmds) +- return ++ return self.command.run(self.base.extcmds) + + def print_usage(self): + return self.optparser.print_usage() +-- +2.4.3 + diff --git a/dnf.spec b/dnf.spec index 89595f0..be82363 100644 --- a/dnf.spec +++ b/dnf.spec @@ -11,13 +11,14 @@ Name: dnf Version: 1.1.2 -Release: 2%{?snapshot}%{?dist} +Release: 3%{?snapshot}%{?dist} Summary: Package manager forked from Yum, using libsolv as a dependency resolver # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2+ and GPLv2 and GPL URL: https://github.com/rpm-software-management/dnf Source0: https://github.com/rpm-software-management/dnf/archive/%{name}-%{version}.tar.gz Patch0: dnf-1.1.2-1-to-dnf-1.1.2-2.patch +Patch1: dnf-1.1.2-2-to-dnf-1.1.2-3.patch BuildArch: noarch BuildRequires: cmake BuildRequires: gettext @@ -139,6 +140,7 @@ Alternative CLI to "dnf upgrade" suitable for automatic, regular execution. %prep %setup -q -n dnf-%{version} %patch0 -p1 +%patch1 -p1 rm -rf py3 mkdir ../py3 cp -a . ../py3/ @@ -270,6 +272,9 @@ exit 0 %systemd_postun_with_restart dnf-automatic.timer %changelog +* Tue Sep 22 2015 Michal Luscon 1.1.2-3 +- Revert "completion_helper: don't get IndexError (RhBug:1250038)" + * Tue Sep 22 2015 Michal Luscon 1.1.2-2 - add hawkey version requirement - revert commit #70956