[PATCH] Warn iff return_{groups, environments} returned an empty list. BZ 1043207

[Zdenek Pavlas]

---
 yum/__init__.py | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/yum/__init__.py b/yum/__init__.py
index caafae4..ec46b77 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -4450,30 +4450,21 @@ much more problems).
             self.logger.warning(e)
             return tx_return
 
+        valid = False
         if group_string and group_string[0] == '^':
             group_string = group_string[1:]
             # Actually dealing with "environment groups".
             for env_grp in comps.return_environments(group_string):
-                try:
-                    txmbrs = self.selectEnvironment(env_grp.environmentid,
-                                                    upgrade=upgrade)
-                    tx_return.extend(txmbrs)
-                except yum.Errors.GroupsError:
-                    self.logger.critical(_('Warning: Environment Group %s does not exist.'), group_string)
-                    continue
-            return tx_return
-
-        for group in comps.return_groups(group_string):
-            try:
-                txmbrs = self.selectGroup(group.groupid, upgrade=upgrade)
+                txmbrs = self.selectEnvironment(env_grp.environmentid, upgrade=upgrade)
                 tx_return.extend(txmbrs)
-            except yum.Errors.GroupsError:
-                self.logger.critical(_('Warning: Group %s does not exist.'), group_string)
-                continue
+                valid = True
         else:
-            self.logger.error(_('Warning: group %s does not exist.'),
-                              group_string)
-
+            for group in comps.return_groups(group_string):
+                txmbrs = self.selectGroup(group.groupid, upgrade=upgrade)
+                tx_return.extend(txmbrs)
+                valid = True
+        if not valid:
+            self.logger.warn(_('Warning: Group %s does not exist.'), group_string)
         return tx_return
 
     def _at_groupupgrade(self, pattern):
-- 
1.7.11.7