@@ -24,7 +24,6 @@ use Text::Glob qw(match_glob);
2424use constant REPOS_DIR => " /etc/yum.repos.d" ;
2525use constant REPOS_TREE => " /software/repositories" ;
2626use constant PKGS_TREE => " /software/packages" ;
27- use constant GROUPS_TREE => " /software/groups/names" ;
2827use constant CMP_TREE => " /software/components/spma" ;
2928use constant YUM_PACKAGE_LIST => " /etc/yum/pluginconf.d/versionlock.list" ;
3029use constant YUM_CONF_FILE => " /etc/yum.conf" ;
@@ -325,16 +324,6 @@ sub Configure
325324 }
326325 }
327326
328- my $groups = defined ($config -> getElement(GROUPS_TREE)) ? $config -> getElement(GROUPS_TREE)-> getTree() : [];
329- # RHEL7 needs converting groups
330- if ($os_major eq ' 7' && @$groups ) {
331- ($cmd_exit , $cmd_out , $cmd_err ) = $self -> execute_command([" yum groups mark convert " . YUM_PLUGIN_OPTS], " converting groups" , 1);
332- if ($cmd_exit ) {
333- $self -> error(" Failed to do group conversion on RHEL7." );
334- return 0;
335- }
336- }
337-
338327 # Get list of packages installed on system before any package modifications.
339328 my $preinstalled = $self -> get_installed_rpms();
340329 return 1 if !defined ($preinstalled );
@@ -448,7 +437,6 @@ sub Configure
448437 $self -> execute_command([" mkdir -p " . $yum_test_chroot . " /var/cache" ], " setting up YUM test chroot" , 1);
449438 $self -> execute_command([" ln -s /var/cache/yum " . $yum_test_chroot . " /var/cache/yum" ], " setting YUM test chroot cache" , 1);
450439 my $yum_install_test_command = " yum install " . YUM_PLUGIN_OPTS . " -C --installroot=" . $yum_test_chroot ;
451- if (@$groups ) { $yum_install_test_command .= " @" . join (" @" , sort @$groups ); }
452440 if (@$wanted_pkgs_locked ) { $yum_install_test_command .= " " . join (" " , sort @$wanted_pkgs_locked ); }
453441 if (@$wanted_pkgs ) { $yum_install_test_command .= " " . join (" " , sort @$wanted_pkgs ); }
454442 ($cmd_exit , $cmd_out , $cmd_err ) = $self -> execute_command([$yum_install_test_command ], " performing YUM chroot install test" , 1, " /dev/null" , " verbose" , 1);
0 commit comments