Author: mzugec Date: Mon Apr 21 15:18:21 2008 New Revision: 46908 URL: http://svn.opensuse.org/viewcvs/yast?rev=46908&view=rev Log: improved algorithm to require gnome/kde version of NetworkManager (bnc#380774) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/routines/routines.ycp trunk/network/yast2-network.spec.in Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=46908&r1=46907&r2=46908&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Apr 21 15:18:21 2008 @@ -1 +1 @@ -2.16.39 +2.16.40 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=46908&r1=46907&r2=46908&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Apr 21 15:18:21 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 21 15:15:53 CEST 2008 - mzugec@suse.cz + +- improved algorithm to require gnome/kde version of NetworkManager + (bnc#380774) +- 2.16.40 + +------------------------------------------------------------------- Fri Apr 18 15:46:22 CEST 2008 - jsrain@suse.cz - merged texts from proofread Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp?rev=46908&r1=46907&r2=46908&view=diff ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Mon Apr 21 15:18:21 2008 @@ -21,6 +21,7 @@ import "Arch"; import "Confirm"; import "Map"; +import "DefaultDesktop"; /** * Abort function @@ -376,10 +377,14 @@ boolean CheckNetworkManagerPlugin(){ if (NetworkService::IsManaged()){ - y2milestone("Check what package is needed to configure NetworkManager"); - string nmp = ((string)SCR::Read(.sysconfig.windowmanager.DEFAULT_WM)=="kde")?"NetworkManager-kde":"NetworkManager-gnome"; + list<string> nmp = []; + y2milestone("Check what packages are needed to configure NetworkManager"); +// string nmp = ((string)SCR::Read(.sysconfig.windowmanager.DEFAULT_WM)=="kde")?"NetworkManager-kde":"NetworkManager-gnome"; + list<string> desktops = DefaultDesktop::SelectedDesktops(); + if (contains(desktops, "kde3")) nmp = add(nmp, "NetworkManager-kde"); + if (contains(desktops, "gnome")) nmp = add(nmp, "NetworkManager-gnome"); y2milestone("Test for %1 if installed", nmp); - PackageSystem::CheckAndInstallPackages([nmp]); + PackageSystem::CheckAndInstallPackages(nmp); } return true; } Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?rev=46908&r1=46907&r2=46908&view=diff ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Mon Apr 21 15:18:21 2008 @@ -12,7 +12,8 @@ # GetInstArgs::automatic_configuration Requires: yast2 >= 2.16.46 -Requires: sysconfig yast2-packager +Requires: sysconfig +Requires: yast2-packager >= 2.16.37 #GetLanguageCountry #(in newly created yast2-country-data) Requires: yast2-country-data >= 2.16.3 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org