Author: mzugec Date: Mon Nov 29 11:34:05 2010 New Revision: 62913 URL: http://svn.opensuse.org/viewcvs/yast?rev=62913&view=rev Log: install qinternet for ISDN only if available (bnc#654604) Modified: branches/SuSE-Code-11-Branch/network/VERSION branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/lan/complex.ycp branches/SuSE-Code-11-Branch/network/src/modem/complex.ycp branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp branches/SuSE-Code-11-Branch/network/src/routines/runtime.ycp branches/SuSE-Code-11-Branch/network/src/routines/widgets.ycp Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/VERSION?rev=62913&r1=62912&r2=62913&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Mon Nov 29 11:34:05 2010 @@ -1 +1 @@ -2.17.78.4 +2.17.78.5 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/package/yast2-network.changes?rev=62913&r1=62912&r2=62913&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Mon Nov 29 11:34:05 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 29 11:33:13 CET 2010 - mzugec@suse.cz + +- install qinternet for ISDN only if available (bnc#654604) +- 2.17.78.5 + +------------------------------------------------------------------- Thu Nov 25 15:02:53 CET 2010 - mzugec@suse.cz - reverted previous YaPI change (see bnc#624655c#14) Modified: branches/SuSE-Code-11-Branch/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/src/lan/complex.ycp?rev=62913&r1=62912&r2=62913&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/lan/complex.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/lan/complex.ycp Mon Nov 29 11:34:05 2010 @@ -151,7 +151,7 @@ // this is one of 3 places to install packages :-( // - kernel modules (InstallKernel): before loaded - // - smpppd & kinternet: before net start + // - smpppd & qinternet: before net start // - wlan firmware: here, just because it is copied from modems // #45960 if(LanItems::Requires != [] && LanItems::Requires != nil) { Modified: branches/SuSE-Code-11-Branch/network/src/modem/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/src/modem/complex.ycp?rev=62913&r1=62912&r2=62913&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/modem/complex.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/modem/complex.ycp Mon Nov 29 11:34:05 2010 @@ -86,7 +86,7 @@ // warning message when modem module starts up and NM is on string warning = _("NetworkManager is enabled. Some features, such as multiple providers for one modem, will not work. -You may want to use kinternet instead."); +You may want to use qinternet instead."); Popup::LongWarning (warning); } */ Modified: branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp?rev=62913&r1=62912&r2=62913&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp Mon Nov 29 11:34:05 2010 @@ -346,8 +346,13 @@ */ global define boolean Write(boolean start) ``{ - // install kinternet if there is at least one ISDN device - #161782 - if (size(Devices["contr"]:$[])>0 && !PackageSystem::Installed("kinternet")) installpackages = add (installpackages, "kinternet"); + // install qinternet if there is at least one ISDN device - #161782 + if (size(Devices["contr"]:$[])>0 && !PackageSystem::Installed("qinternet")){ + if (Package::Available("qinternet")) + installpackages = add (installpackages, "qinternet"); + else + y2error("There's no qinternet package available."); + } if (installpackages != nil && installpackages != [""]) { symbol retp = PackagesInstall((list<string>) installpackages); Modified: branches/SuSE-Code-11-Branch/network/src/routines/runtime.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/src/routines/runtime.ycp?rev=62913&r1=62912&r2=62913&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/routines/runtime.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/routines/runtime.ycp Mon Nov 29 11:34:05 2010 @@ -61,7 +61,7 @@ } /** - * Are there interfaces controlled by smpppd and kinternet? + * Are there interfaces controlled by smpppd and qinternet? * They are the ones with USERCONTROL=yes (#44303) * @return true/false */ Modified: branches/SuSE-Code-11-Branch/network/src/routines/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/src/routines/widgets.ycp?rev=62913&r1=62912&r2=62913&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/routines/widgets.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/routines/widgets.ycp Mon Nov 29 11:34:05 2010 @@ -117,7 +117,7 @@ "label": _("Manually"), // help text for Device Activation "help": _("<p><b>Manually</b>: You control the interface manually -via 'ifup' or 'kinternet' (see 'User Controlled' below)</p>. +via 'ifup' or 'qinternet' (see 'User Controlled' below)</p>. "), ], "ifplugd": $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org