Attachment 883892 Details for Bug 1080331 – fix for group install

[patch] fix for group install

0001-fix-group-install-RhBug-1080331.patch (text/plain), 3.05 KB, created by Tim Lauridsen on 2014-04-08 06:31:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Lauridsen

Created: 2014-04-08 06:31:17 UTC

Size: 3.05 KB

patch

obsolete

>From c7aec324c5cb16cac5b28732dc359f9e7225bcc4 Mon Sep 17 00:00:00 2001
>From: Tim Lauridsen <timlau@fedoraproject.org>
>Date: Tue, 8 Apr 2014 08:28:21 +0200
>Subject: [PATCH] fix group install (RhBug #1080331)
>
>---
> dnf/cli/commands/group.py | 26 +++++++++++++++++---------
> 1 file changed, 17 insertions(+), 9 deletions(-)
>
>diff --git a/dnf/cli/commands/group.py b/dnf/cli/commands/group.py
>index 17ae8e2..7c5f585 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
>@@ -143,12 +143,19 @@ class GroupCommand(commands.Command):
> 
>     def _remove(self, patterns):
>         cnt = 0
>+        found = False
>         for env in self._patterns2environments(patterns):
>+            found = True
>             cnt += self.base.environment_remove(env)
>         for grp in self._patterns2groups(patterns):
>+            found = True
>             cnt += self.base.group_remove(grp)
>-        if not cnt:
>-            raise dnf.cli.CliError(_('No packages to remove from given groups.'))
>+        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)
> 
>     def _split_extcmds(self, extcmds):
>         if extcmds[0] == 'with-optional':
>@@ -178,6 +185,7 @@ class GroupCommand(commands.Command):
>         demands.sack_activation = True
>         if cmd in ('install', 'mark', 'remove', 'upgrade'):
>             demands.root_user = True
>+            demands.resolving = True
> 
>     def doCheck(self, basecmd, extcmds):
>         """Verify that conditions are met so that this command can run.
>-- 
>1.9.0
>

Actions: View | Diff

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