Author: locilka Date: Wed Jan 12 15:39:26 2011 New Revision: 63172 URL: http://svn.opensuse.org/viewcvs/yast?rev=63172&view=rev Log: Non-GPLv3 packages are preferred, not vice versa Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm?rev=63172&r1=63171&r2=63172&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm Wed Jan 12 15:39:26 2011 @@ -84,8 +84,8 @@ sub CheckAndInstallPackages { # Check whether samba is installed as 'samba' or 'samba-gplv3' and install the rest of packages # GPLv3 packages are preferred - PackageSystem->InstalledAny($RequiredPackages) && PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages) || - PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages_gplv3) || + PackageSystem->InstalledAny($RequiredPackages_gplv3) && PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages_gplv3) || + PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages) || return 0; return 1; @@ -394,11 +394,11 @@ my ($self) = @_; # Check whether any 'samba' is installed and keep it - if (PackageSystem->InstalledAny($RequiredPackages)) { + if (PackageSystem->InstalledAny($RequiredPackages_gplv3)) { return { install => $RequiredPackages, remove => []}; # If any other samba (GPLv3) or none is installed, prefer the GPLv3 } else { - return { install => $RequiredPackages_gplv3, remove => []}; + return { install => $RequiredPackages, remove => []}; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org