Attachment 883877 Details for Bug 1080331 – Better patch (wrong checkout)

[patch] Better patch (wrong checkout)

0001-fix-group-install-RhBug-1080331.patch (text/plain), 1.85 KB, created by Tim Lauridsen on 2014-04-08 05:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Lauridsen

Created: 2014-04-08 05:50:03 UTC

Size: 1.85 KB

patch

obsolete

>From 1cb06508037c632df0f04f7cc60e7f2e5c157126 Mon Sep 17 00:00:00 2001
>From: Tim Lauridsen <timlau@fedoraproject.org>
>Date: Tue, 8 Apr 2014 07:48:56 +0200
>Subject: [PATCH] fix group install (RhBug #1080331)
>
>---
> dnf/cli/commands/group.py | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/dnf/cli/commands/group.py b/dnf/cli/commands/group.py
>index 17ae8e2..cfeb65d 100644
>--- a/dnf/cli/commands/group.py
>+++ b/dnf/cli/commands/group.py
>@@ -88,11 +88,17 @@ class GroupCommand(commands.Command):
>     def _install(self, extcmds):
>         cnt = 0
>         types, patterns = self._split_extcmds(extcmds)
>+        found = False
>         for env in self._patterns2environments(patterns):
>+            found = True
>             cnt += self.base.environment_install(env, types)
>         for grp in self._patterns2groups(patterns):
>+            found = True
>             cnt += self.base.group_install(grp, types)
>-        if not cnt:
>+        if not found:
>+            msg = _("No relevant match for the specified groups")
>+            raise dnf.cli.CliError(msg)
>+        elif not cnt:
>             msg = _('No packages in any requested groups available to install.')
>             raise dnf.cli.CliError(msg)
> 
>@@ -122,16 +128,10 @@ class GroupCommand(commands.Command):
>     def _patterns2(fn, patterns, fltr):
>         for pat in patterns:
>             grps = fn(pat)
>-            cnt = 0
>             for grp in grps:
>                 if not fltr(grp):
>                     continue
>                 yield grp
>-                cnt += 1
>-            if not cnt:
>-                msg = _("No relevant match for the specified '%s'.")
>-                msg = msg % to_unicode(pat)
>-                raise dnf.cli.CliError(msg)
> 
>     def _patterns2environments(self, patterns, fltr=lambda grp: True):
>         fn = self.base.comps.environments_by_pattern
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1080331: 883863 | 883876 | 883877 | 883892