Author: mzugec Date: Mon Nov 29 11:19:46 2010 New Revision: 62910 URL: http://svn.opensuse.org/viewcvs/yast?rev=62910&view=rev Log: require qinternet only when available (bnc#654604) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/modules/ISDN.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/VERSION?rev=62910&r1=62909&r2=62910&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Mon Nov 29 11:19:46 2010 @@ -1 +1 @@ -2.17.147 +2.17.148 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes?rev=62910&r1=62909&r2=62910&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Mon Nov 29 11:19:46 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 29 11:19:05 CET 2010 - mzugec@suse.cz + +- require qinternet only when available (bnc#654604) +- 2.17.148 + +------------------------------------------------------------------- Fri Nov 26 15:32:13 CET 2010 - mzugec@suse.cz - replaced kinternet dependency with qinternet (bnc#654604) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/ISDN.ycp?rev=62910&r1=62909&r2=62910&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/ISDN.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/ISDN.ycp Mon Nov 29 11:19:46 2010 @@ -347,7 +347,13 @@ global define boolean Write(boolean start) ``{ // install qinternet if there is at least one ISDN device - #161782 - if (size(Devices["contr"]:$[])>0 && !PackageSystem::Installed("qinternet")) installpackages = add (installpackages, "qinternet"); + // only if package available (it's not in SLE) (bnc#654604) + if (size(Devices["contr"]:$[])>0 && !PackageSystem::Installed("qinternet")) { + if (Package::Available("qinternet")) + installpackages = add (installpackages, "qinternet"); + else + y2error("Package qinternet is not available."); + } if (installpackages != nil && installpackages != [""]) { symbol retp = PackagesInstall((list<string>) installpackages); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org