Author: locilka Date: Wed Jan 12 15:05:25 2011 New Revision: 63169 URL: http://svn.opensuse.org/viewcvs/yast?rev=63169&view=rev Log: Added AutoYaST support for samba-gplv3 packages (BNC #657414) Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/VERSION branches/SuSE-SLE-10-SP3-Branch/samba-server/package/yast2-samba-server.changes branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-server/VERSION?rev=63169&r1=63168&r2=63169&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-server/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-server/VERSION Wed Jan 12 15:05:25 2011 @@ -1 +1 @@ -2.13.26 +2.13.27 Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-server/package/yast2-samba-server.changes?rev=63169&r1=63168&r2=63169&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-server/package/yast2-samba-server.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-server/package/yast2-samba-server.changes Wed Jan 12 15:05:25 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 12 14:58:18 CET 2011 - locilka@suse.cz + +- Added AutoYaST support for samba-gplv3 packages (BNC #657414) +- 2.13.27 + +------------------------------------------------------------------- Wed Jan 5 14:26:04 CET 2011 - locilka@suse.cz - Import sets Modified to true (BNC #572670). 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=63169&r1=63168&r2=63169&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:05:25 2011 @@ -82,12 +82,13 @@ # Check that packages are installed or offer their installation BEGIN{ $TYPEINFO{GetModified} = ["function", "boolean"] } sub CheckAndInstallPackages { - # installed_required_packages? or installed_packages_gplv3? or install_packages! - PackageSystem->InstalledAll($RequiredPackages) || - PackageSystem->InstalledAll($RequiredPackages_gplv3) || - PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages) || - return 0; - return 1; + # 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) || + return 0; + + return 1; } # Read all samba-server settings @@ -391,7 +392,14 @@ BEGIN{$TYPEINFO{AutoPackages}=["function",["map","string",["list","string"]]]} sub AutoPackages { my ($self) = @_; - return { install=> $RequiredPackages, remove => []}; + + # Check whether any 'samba' is installed and keep it + if PackageSystem->InstalledAny($RequiredPackages) { + return { install => $RequiredPackages, remove => []}; + # If any other samba (GPLv3) or none is installed, prefer the GPLv3 + } else { + return { install => $RequiredPackages_gplv3, remove => []}; + } } 8; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org