Author: locilka Date: Tue Jan 4 17:25:35 2011 New Revision: 63076 URL: http://svn.opensuse.org/viewcvs/yast?rev=63076&view=rev Log: Also accepting samba-gplv3 packages (BNC #657414) Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes?rev=63076&r1=63075&r2=63076&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes Tue Jan 4 17:25:35 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 4 17:18:23 CET 2011 - locilka@suse.cz + +- Also accepting samba-gplv3 packages (BNC #657414) +- 2.13.25 + +------------------------------------------------------------------- Fri Feb 19 16:55:02 CET 2010 - locilka@suse.cz - Re-added possibility to allow guest access (BNC #579993). Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm?rev=63076&r1=63075&r2=63076&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm Tue Jan 4 17:25:35 2011 @@ -54,6 +54,8 @@ # list of required packages my $RequiredPackages = ["samba", "samba-client"]; +# ... or another packages (BNC #657414) +my $RequiredPackages_gplv3 = ["samba-gplv3", "samba-gplv3-client"]; my $GlobalsConfigured = 0; @@ -77,6 +79,17 @@ || SambaAccounts->GetModified(); }; +# 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; +} + # Read all samba-server settings # @param force_reread force reread configuration # @param no_progreass_bar disable progress bar @@ -129,7 +142,7 @@ Progress->NextStage(); # check installed packages unless (Mode->test()) { - PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages) or return 0; + CheckAndInstallPackages() or return 0; } SambaConfig->Read(); Samba->ReadSharesSetting(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org