Author: jsuchome Date: Tue Jan 11 14:04:16 2011 New Revision: 63154 URL: http://svn.opensuse.org/viewcvs/yast?rev=63154&view=rev Log: - prefer gplv3 packages (bnc#657414) - 2.13.42.1 Modified: branches/SuSE-SLE-10-SP3-Branch/samba-client/VERSION branches/SuSE-SLE-10-SP3-Branch/samba-client/package/yast2-samba-client.changes branches/SuSE-SLE-10-SP3-Branch/samba-client/src/Samba.ycp branches/SuSE-SLE-10-SP3-Branch/samba-client/src/SambaNmbLookup.pm branches/SuSE-SLE-10-SP3-Branch/samba-client/src/SambaWinbind.pm branches/SuSE-SLE-10-SP3-Branch/samba-client/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-client/VERSION?rev=63154&r1=63153&r2=63154&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-client/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-client/VERSION Tue Jan 11 14:04:16 2011 @@ -1 +1 @@ -2.13.42 +2.13.42.1 Modified: branches/SuSE-SLE-10-SP3-Branch/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-client/package/yast2-samba-client.changes?rev=63154&r1=63153&r2=63154&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-client/package/yast2-samba-client.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-client/package/yast2-samba-client.changes Tue Jan 11 14:04:16 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 10 14:24:05 CET 2011 - jsuchome@suse.cz + +- prefer gplv3 packages (bnc#657414) +- 2.13.42.1 + +------------------------------------------------------------------- Fri Aug 21 11:50:07 CEST 2009 - jsuchome@suse.cz - include /etc/samba/dhcp.conf in temporary smb.conf if such Modified: branches/SuSE-SLE-10-SP3-Branch/samba-client/src/Samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-client/src/Samba.ycp?rev=63154&r1=63153&r2=63154&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-client/src/Samba.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-client/src/Samba.ycp Tue Jan 11 14:04:16 2011 @@ -432,8 +432,9 @@ // read global settings Progress::NextStage(); - // check installed packages - if (!PackageSystem::CheckAndInstallPackagesInteractive( + // check installed packages (samba-gplv3-client preferred: bnc#657414) + if (!Package::Installed ("samba-gplv3-client") && + !PackageSystem::CheckAndInstallPackagesInteractive( UpdatedArchPackages (["samba-client"]))) { y2warning("package samba-client not installed"); @@ -569,7 +570,7 @@ // winbind Progress::NextStage(); if (winbind_enabled) { - if (!Package::Installed("samba-winbind") && !Mode::test()) { + if (!Package::Installed ("samba-gplv3-winbind") && !Package::Installed("samba-winbind") && !Mode::test()) { ret = false; } if (!SambaWinbind::AdjustService(true)) { @@ -843,7 +844,14 @@ * @return map of packages to be installed and to be removed */ global define map AutoPackages() ``{ + list<string> to_install = ["samba-client", "samba-winbind"]; + + if (Package::InstalledAll (["samba-gplv3-client", "samba-gplv3-winbind"])) + { + y2milestone ("gplv3 packages already installed, nothing more needed"); + to_install = []; + } if (SambaAD::ADS () != "") to_install = (list<string>) union (to_install, ["krb5", "krb5-client"]); return $[ Modified: branches/SuSE-SLE-10-SP3-Branch/samba-client/src/SambaNmbLookup.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-client/src/SambaNmbLookup.pm?rev=63154&r1=63153&r2=63154&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-client/src/SambaNmbLookup.pm (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-client/src/SambaNmbLookup.pm Tue Jan 11 14:04:16 2011 @@ -52,13 +52,13 @@ sub Start { my ($self) = @_; - if (!PackageSystem->Installed("samba-client")) { + if (!PackageSystem->InstalledAll(["samba-client","samba-gplv3-client"])) { y2error("package samba-client not installed"); return FALSE; } # first, check if nmbd is running - if (PackageSystem->Installed("samba") && Service->Status("nmb")==0) { + if (PackageSystem->InstalledAny(["samba","sambagplv3"]) && Service->Status("nmb")==0) { $Nmbd_was_running = 1; y2debug("Stopping nmbd for nmbstatus"); # FIXME: we should check, if stop did not fail Modified: branches/SuSE-SLE-10-SP3-Branch/samba-client/src/SambaWinbind.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-client/src/SambaWinbind.pm?rev=63154&r1=63153&r2=63154&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-client/src/SambaWinbind.pm (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-client/src/SambaWinbind.pm Tue Jan 11 14:04:16 2011 @@ -39,7 +39,7 @@ BEGIN{$TYPEINFO{IsEnabled}=["function","boolean"]} sub IsEnabled { my ($self) = @_; - if (PackageSystem->Installed("samba-winbind")) { + if (PackageSystem->InstalledAny(["samba-winbind","samba-gplv3-winbind"])) { return Service->Enabled("winbind"); } return FALSE; @@ -167,7 +167,7 @@ BEGIN{$TYPEINFO{AdjustService}=["function","boolean","boolean"]} sub AdjustService { my ($self, $on) = @_; - my $installed = PackageSystem->Installed("samba-winbind"); + my $installed = PackageSystem->InstalledAny(["samba-winbind","samba-gplv3-winbind"]); return TRUE if !$on && !$installed; # return ok if ($on && !$installed) { y2debug("Try to enable winbind service, but samba-winbind isn't installed."); @@ -186,7 +186,7 @@ BEGIN{$TYPEINFO{StartStopNow}=["function","boolean","boolean"]} sub StartStopNow { my ($self, $on) = @_; - my $installed = PackageSystem->Installed("samba-winbind"); + my $installed = PackageSystem->InstalledAny(["samba-winbind","samba-gplv3-winbind"]); return TRUE if !$on && !$installed; # return ok if ($on && !$installed) { y2debug("Try to enable winbind service, but samba-winbind isn't installed."); Modified: branches/SuSE-SLE-10-SP3-Branch/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-client/src/dialogs.ycp?rev=63154&r1=63153&r2=63154&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-client/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-client/src/dialogs.ycp Tue Jan 11 14:04:16 2011 @@ -390,6 +390,11 @@ } list<string> packages = ["samba-winbind"]; + if (Package::Installed ("samba-gplv3-winbind")) + { + y2milestone ("samba-gplv3-winbind already installed"); + packages = []; + } if (SambaAD::ADS () != "") { packages = (list<string>)merge(packages,["krb5","krb5-client"]); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org