November 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62923 - /tags/stable-2_20_13/packager/
by lslezak＠svn2.opensuse.org 30 Nov '10

30 Nov '10

Author: lslezak Date: Tue Nov 30 16:03:34 2010 New Revision: 62923 URL: http://svn.opensuse.org/viewcvs/yast?rev=62923&view=rev Log: Created tag stable-2_20_13 for packager Added: tags/stable-2_20_13/packager/ - copied from r62922, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62922 - /tags/stable-2_20_13/
by lslezak＠svn2.opensuse.org 30 Nov '10

30 Nov '10

Author: lslezak Date: Tue Nov 30 16:03:32 2010 New Revision: 62922 URL: http://svn.opensuse.org/viewcvs/yast?rev=62922&view=rev Log: Created tag stable-2_20_13 Added: tags/stable-2_20_13/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62921 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/PackageSlideShow.ycp
by lslezak＠svn2.opensuse.org 30 Nov '10

30 Nov '10

Author: lslezak Date: Tue Nov 30 16:03:25 2010 New Revision: 62921 URL: http://svn.opensuse.org/viewcvs/yast?rev=62921&view=rev Log: - fixed DownloadInAdvance mode check - it's the default now (bnc#653497) - 2.20.13 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageSlideShow.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62921&r1=62… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Nov 30 16:03:25 2010 @@ -1 +1 @@ -2.20.12 +2.20.13 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Nov 30 16:03:25 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 30 14:58:31 UTC 2010 - lslezak(a)suse.cz + +- fixed DownloadInAdvance mode check - it's the default now + (bnc#653497) +- 2.20.13 + +------------------------------------------------------------------- Fri Nov 12 11:37:16 UTC 2010 - lslezak(a)suse.cz - display more details when adding a community repository fails Modified: trunk/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageSlid… ============================================================================== --- trunk/packager/src/modules/PackageSlideShow.ycp (original) +++ trunk/packager/src/modules/PackageSlideShow.ycp Tue Nov 30 16:03:25 2010 @@ -17,6 +17,7 @@ import "String"; import "Mode"; import "URL"; + import "Installation"; global list<list<integer> > total_sizes_per_cd_per_src = []; // total sizes per inst-src: [ [42, 43, 44], [12, 13, 14] ] global list<list<integer> > remaining_sizes_per_cd_per_src = []; // remaining sizes @@ -510,7 +511,13 @@ total_count_downloaded = 0; integer total_count_to_install = packages_to_install(total_pkg_count_per_cd_per_src); downloading_pct = 100 * total_count_to_download / (total_count_to_install + total_count_to_download); - download_in_advance_mode= (string)SCR::Read(.etc.zypp_conf.value.main."commit.downloadMode") == "DownloadInAdvance"; + + string download_mode = (string)SCR::Read(.etc.zypp_conf.value.main."commit.downloadMode"); + // DownloadInAdvance is default for local (root=/) install since openSUSE-11.4 (bnc#653497) + // (we cannot get the target root from Pkg:: so we have to check the mode instead) + download_in_advance_mode = download_mode == "DownloadInAdvance" || + (download_mode == nil && Mode::normal() && !Installation::dirinstall_installing_into_dir); + init_pkg_data_complete = true; // reset the history log -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62920 - /trunk/storage/storage/src/include/ep-lib.ycp
by aschnell＠svn2.opensuse.org 30 Nov '10

30 Nov '10

Author: aschnell Date: Tue Nov 30 12:12:39 2010 New Revision: 62920 URL: http://svn.opensuse.org/viewcvs/yast?rev=62920&view=rev Log: - added sanity checks (can happen when partition is outside of disk) Modified: trunk/storage/storage/src/include/ep-lib.ycp Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Tue Nov 30 12:12:39 2010 @@ -345,9 +345,9 @@ next_cyl = Region::Start( partitions[ i+1, "region" ]:[] ); } - float tmp = (float) Region::Length(region) / (float) disk["cyl_count"]:1; - y2debug("i:%1 this cyl:%2 end cyl:%3 next cyl:%4", i, ccyl, Region::End(region), next_cyl); - AddSegment(tmp, part["name"]:"", part["size_k"]:0); + float tmp1 = (float) Region::Length(region) / (float) disk["cyl_count"]:1; + if (tmp1 >= 0.0) + AddSegment(tmp1, part["name"]:"", part["size_k"]:0); // Now there is some xtra space between the end of this partition and the start of the next one // or the end of the disk if @@ -357,7 +357,8 @@ ( (Region::End( region) + 1) != next_cyl ) ) { float tmp2 = (float) (next_cyl - Region::End(region)) / (float) disk["cyl_count"]:1; - AddSegment(tmp2, emptyspace, ((next_cyl - Region::End(region)) * disk["cyl_size"]:1) / 1024); + if (tmp2 >= 0.0) + AddSegment(tmp2, emptyspace, ((next_cyl - Region::End(region)) * disk["cyl_size"]:1) / 1024); } ccyl = next_cyl; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62919 - /trunk/ncurses/src/NCPadWidget.cc
by gs＠svn2.opensuse.org 30 Nov '10

30 Nov '10

Author: gs Date: Tue Nov 30 08:02:40 2010 New Revision: 62919 URL: http://svn.opensuse.org/viewcvs/yast?rev=62919&view=rev Log: add yuiDebug Modified: trunk/ncurses/src/NCPadWidget.cc Modified: trunk/ncurses/src/NCPadWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPadWidget.cc?rev=6… ============================================================================== --- trunk/ncurses/src/NCPadWidget.cc (original) +++ trunk/ncurses/src/NCPadWidget.cc Tue Nov 30 08:02:40 2010 @@ -403,6 +403,8 @@ if ( !win ) return; + yuiDebug() << "wRedraw called for: " << win << endl; + const NCstyle::StWidget & style( frameStyle() ); win->bkgdset( style.plain ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62918 - /trunk/ncurses/src/NCPadWidget.cc
by gs＠svn2.opensuse.org 30 Nov '10

30 Nov '10

Author: gs Date: Tue Nov 30 07:33:33 2010 New Revision: 62918 URL: http://svn.opensuse.org/viewcvs/yast?rev=62918&view=rev Log: yuiDebug removed (not needed) Modified: trunk/ncurses/src/NCPadWidget.cc Modified: trunk/ncurses/src/NCPadWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPadWidget.cc?rev=6… ============================================================================== --- trunk/ncurses/src/NCPadWidget.cc (original) +++ trunk/ncurses/src/NCPadWidget.cc Tue Nov 30 07:33:33 2010 @@ -403,8 +403,6 @@ if ( !win ) return; - yuiDebug() << "wRedraw called for: " << win << endl; - const NCstyle::StWidget & style( frameStyle() ); win->bkgdset( style.plain ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62917 - in /branches/SuSE-Code-11-SP1-Branch/network: package/yast2-network.changes src/modules/ISDN.ycp src/routines/widgets.ycp
by mzugec＠svn2.opensuse.org 29 Nov '10

29 Nov '10

Author: mzugec Date: Mon Nov 29 14:04:32 2010 New Revision: 62917 URL: http://svn.opensuse.org/viewcvs/yast?rev=62917&view=rev Log: reverted changed strings (qinternet/kinternet) Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/modules/ISDN.ycp branches/SuSE-Code-11-SP1-Branch/network/src/routines/widgets.ycp 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/netwo… ============================================================================== --- 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 14:04:32 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 29 14:01:27 CET 2010 - mzugec(a)suse.cz + +- reverted changed strings (qinternet/kinternet) + +------------------------------------------------------------------- Mon Nov 29 11:19:05 CET 2010 - mzugec(a)suse.cz - require qinternet only when available (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/netwo… ============================================================================== --- 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 14:04:32 2010 @@ -352,7 +352,7 @@ if (Package::Available("qinternet")) installpackages = add (installpackages, "qinternet"); else - y2error("Package qinternet is not available."); + y2error("Package kinternet is not available."); } if (installpackages != nil && installpackages != [""]) { Modified: branches/SuSE-Code-11-SP1-Branch/network/src/routines/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/routines/widgets.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/routines/widgets.ycp Mon Nov 29 14:04:32 2010 @@ -117,7 +117,7 @@ "label": _("Manually"), // help text for Device Activation "help": _("Manually: You control the interface manually -via 'ifup' or 'qinternet' (see 'User Controlled' below). +via 'ifup' or 'kinternet' (see 'User Controlled' below). "), ], "ifplugd": $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62916 - in /branches/SuSE-Code-11-Branch/network: package/yast2-network.changes src/modules/ISDN.ycp src/routines/widgets.ycp
by mzugec＠svn2.opensuse.org 29 Nov '10

29 Nov '10

Author: mzugec Date: Mon Nov 29 13:58:46 2010 New Revision: 62916 URL: http://svn.opensuse.org/viewcvs/yast?rev=62916&view=rev Log: reverted changed strings (kinternet/qinternet) Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp branches/SuSE-Code-11-Branch/network/src/routines/widgets.ycp Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/p… ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Mon Nov 29 13:58:46 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 29 13:58:04 CET 2010 - mzugec(a)suse.cz + +- reverted changed strings (kinternet/qinternet) + +------------------------------------------------------------------- Mon Nov 29 11:33:13 CET 2010 - mzugec(a)suse.cz - install qinternet for ISDN only if available (bnc#654604) Modified: branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp Mon Nov 29 13:58:46 2010 @@ -351,7 +351,7 @@ if (Package::Available("qinternet")) installpackages = add (installpackages, "qinternet"); else - y2error("There's no qinternet package available."); + y2error("There's no kinternet package available."); } if (installpackages != nil && installpackages != [""]) { Modified: branches/SuSE-Code-11-Branch/network/src/routines/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/routines/widgets.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/routines/widgets.ycp Mon Nov 29 13:58:46 2010 @@ -117,7 +117,7 @@ "label": _("Manually"), // help text for Device Activation "help": _("Manually: You control the interface manually -via 'ifup' or 'qinternet' (see 'User Controlled' below). +via 'ifup' or 'kinternet' (see 'User Controlled' below). "), ], "ifplugd": $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62915 - /tags/branch-Code-11-2_17_78_5/network/
by mzugec＠svn2.opensuse.org 29 Nov '10

29 Nov '10

Author: mzugec Date: Mon Nov 29 11:34:14 2010 New Revision: 62915 URL: http://svn.opensuse.org/viewcvs/yast?rev=62915&view=rev Log: Created tag branch-Code-11-2_17_78_5 for network Added: tags/branch-Code-11-2_17_78_5/network/ - copied from r62914, branches/SuSE-Code-11-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62914 - /tags/branch-Code-11-2_17_78_5/
by mzugec＠svn2.opensuse.org 29 Nov '10

29 Nov '10

Author: mzugec Date: Mon Nov 29 11:34:12 2010 New Revision: 62914 URL: http://svn.opensuse.org/viewcvs/yast?rev=62914&view=rev Log: Created tag branch-Code-11-2_17_78_5 Added: tags/branch-Code-11-2_17_78_5/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62913 - in /branches/SuSE-Code-11-Branch/network: ./ package/ src/lan/ src/modem/ src/modules/ src/routines/
by mzugec＠svn2.opensuse.org 29 Nov '10

29 Nov '10

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/V… ============================================================================== --- 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/p… ============================================================================== --- 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(a)suse.cz + +- install qinternet for ISDN only if available (bnc#654604) +- 2.17.78.5 + +------------------------------------------------------------------- Thu Nov 25 15:02:53 CET 2010 - mzugec(a)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/s… ============================================================================== --- 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/s… ============================================================================== --- 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/s… ============================================================================== --- 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/s… ============================================================================== --- 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/s… ============================================================================== --- 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": _("Manually: You control the interface manually -via 'ifup' or 'kinternet' (see 'User Controlled' below). +via 'ifup' or 'qinternet' (see 'User Controlled' below). "), ], "ifplugd": $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62912 - /tags/branch-Code-11-SP1-2_17_148/network/
by mzugec＠svn2.opensuse.org 29 Nov '10

29 Nov '10

Author: mzugec Date: Mon Nov 29 11:20:00 2010 New Revision: 62912 URL: http://svn.opensuse.org/viewcvs/yast?rev=62912&view=rev Log: Created tag branch-Code-11-SP1-2_17_148 for network Added: tags/branch-Code-11-SP1-2_17_148/network/ (props changed) - copied from r62911, branches/SuSE-Code-11-SP1-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62911 - /tags/branch-Code-11-SP1-2_17_148/
by mzugec＠svn2.opensuse.org 29 Nov '10

29 Nov '10

Author: mzugec Date: Mon Nov 29 11:19:57 2010 New Revision: 62911 URL: http://svn.opensuse.org/viewcvs/yast?rev=62911&view=rev Log: Created tag branch-Code-11-SP1-2_17_148 Added: tags/branch-Code-11-SP1-2_17_148/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62910 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/modules/ISDN.ycp
by mzugec＠svn2.opensuse.org 29 Nov '10

29 Nov '10

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/netwo… ============================================================================== --- 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/netwo… ============================================================================== --- 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(a)suse.cz + +- require qinternet only when available (bnc#654604) +- 2.17.148 + +------------------------------------------------------------------- Fri Nov 26 15:32:13 CET 2010 - mzugec(a)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/netwo… ============================================================================== --- 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62909 - in /branches/SuSE-Code-11-SP1-Branch/network: package/yast2-network.changes src/lan/complex.ycp src/modem/complex.ycp src/modules/ISDN.ycp src/routines/runtime.ycp src/routines/widgets.ycp
by mzugec＠svn2.opensuse.org 26 Nov '10

26 Nov '10

Author: mzugec Date: Fri Nov 26 15:33:58 2010 New Revision: 62909 URL: http://svn.opensuse.org/viewcvs/yast?rev=62909&view=rev Log: replaced kinternet dependency with qinternet (bnc#654604) Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modem/complex.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/ISDN.ycp branches/SuSE-Code-11-SP1-Branch/network/src/routines/runtime.ycp branches/SuSE-Code-11-SP1-Branch/network/src/routines/widgets.ycp 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/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Fri Nov 26 15:33:58 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 26 15:32:13 CET 2010 - mzugec(a)suse.cz + +- replaced kinternet dependency with qinternet (bnc#654604) +- 2.17.147 + +------------------------------------------------------------------- Tue Nov 16 11:07:19 CET 2010 - mzugec(a)suse.cz - L3: accept unconfigured+BOOTPROTO=none bondslaves (bnc#652987) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp Fri Nov 26 15:33:58 2010 @@ -141,7 +141,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-SP1-Branch/network/src/modem/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modem/complex.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modem/complex.ycp Fri Nov 26 15:33:58 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-SP1-Branch/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/ISDN.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/ISDN.ycp Fri Nov 26 15:33:58 2010 @@ -346,8 +346,8 @@ */ 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")) installpackages = add (installpackages, "qinternet"); if (installpackages != nil && installpackages != [""]) { symbol retp = PackagesInstall((list<string>) installpackages); Modified: branches/SuSE-Code-11-SP1-Branch/network/src/routines/runtime.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/routines/runtime.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/routines/runtime.ycp Fri Nov 26 15:33:58 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-SP1-Branch/network/src/routines/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/routines/widgets.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/routines/widgets.ycp Fri Nov 26 15:33:58 2010 @@ -117,7 +117,7 @@ "label": _("Manually"), // help text for Device Activation "help": _("Manually: You control the interface manually -via 'ifup' or 'kinternet' (see 'User Controlled' below). +via 'ifup' or 'qinternet' (see 'User Controlled' below). "), ], "ifplugd": $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62908 - /tags/stable-2_20_5/network/
by mzugec＠svn2.opensuse.org 26 Nov '10

26 Nov '10

Author: mzugec Date: Fri Nov 26 14:14:47 2010 New Revision: 62908 URL: http://svn.opensuse.org/viewcvs/yast?rev=62908&view=rev Log: Created tag stable-2_20_5 for network Added: tags/stable-2_20_5/network/ - copied from r62907, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62907 - in /trunk/network: VERSION package/yast2-network.changes src/config/dsl.desktop src/config/lan.desktop
by mzugec＠svn2.opensuse.org 26 Nov '10

26 Nov '10

Author: mzugec Date: Fri Nov 26 14:14:39 2010 New Revision: 62907 URL: http://svn.opensuse.org/viewcvs/yast?rev=62907&view=rev Log: added search keywords (bnc#641922) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/config/dsl.desktop trunk/network/src/config/lan.desktop Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62907&r1=629… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Nov 26 14:14:39 2010 @@ -1 +1 @@ -2.20.4 +2.20.5 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Nov 26 14:14:39 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 26 14:09:27 CET 2010 - mzugec(a)suse.cz + +- added search keywords (bnc#641922) +- 2.20.5 + +------------------------------------------------------------------- Tue Nov 16 11:13:12 CET 2010 - mzugec(a)suse.cz - accept unconfigured + BOOTPROTO=none bondslaves (bnc#652987) Modified: trunk/network/src/config/dsl.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/dsl.desktop?r… ============================================================================== --- trunk/network/src/config/dsl.desktop (original) +++ trunk/network/src/config/dsl.desktop Fri Nov 26 14:14:39 2010 @@ -22,3 +22,4 @@ Name=DSL GenericName=Configure a DSL connection StartupNotify=true +X-SuSE-YaST-Keywords=dsl,vpn,pptp,pppoe,network Modified: trunk/network/src/config/lan.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/lan.desktop?r… ============================================================================== --- trunk/network/src/config/lan.desktop (original) +++ trunk/network/src/config/lan.desktop Fri Nov 26 14:14:39 2010 @@ -24,3 +24,4 @@ Name=Network Settings GenericName=Configure network cards, hostname and routing StartupNotify=true +X-SuSE-YaST-Keywords=network,lan,dns,routing -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62906 - /tags/stable-2_20_1/ncurses/
by gs＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: gs Date: Thu Nov 25 16:47:59 2010 New Revision: 62906 URL: http://svn.opensuse.org/viewcvs/yast?rev=62906&view=rev Log: Created tag stable-2_20_1 for ncurses Added: tags/stable-2_20_1/ncurses/ - copied from r62905, trunk/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62905 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: gs Date: Thu Nov 25 16:47:51 2010 New Revision: 62905 URL: http://svn.opensuse.org/viewcvs/yast?rev=62905&view=rev Log: V 2.20.1 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=62905&r1=629… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Thu Nov 25 16:47:51 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Thu Nov 25 16:47:51 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 25 16:37:09 CET 2010 - gs(a)suse.de + +- Correct color for keyboard shortcut, visible cursor in multi line + text entry (bug-fix for bnc #652240) +- V 2.20.1 + +------------------------------------------------------------------- Tue Oct 12 14:49:51 CEST 2010 - gs(a)suse.de - NCRichText: bug-fix for pre tag (bnc #484629) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62904 - /tags/branch-SLE-10-SP4-2_13_119/yast2/
by lslezak＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: lslezak Date: Thu Nov 25 16:47:40 2010 New Revision: 62904 URL: http://svn.opensuse.org/viewcvs/yast?rev=62904&view=rev Log: Created tag branch-SLE-10-SP4-2_13_119 for yast2 Added: tags/branch-SLE-10-SP4-2_13_119/yast2/ (props changed) - copied from r62903, branches/SuSE-SLE-10-SP4-Branch/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62903 - /tags/branch-SLE-10-SP4-2_13_119/
by lslezak＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: lslezak Date: Thu Nov 25 16:47:38 2010 New Revision: 62903 URL: http://svn.opensuse.org/viewcvs/yast?rev=62903&view=rev Log: Created tag branch-SLE-10-SP4-2_13_119 Added: tags/branch-SLE-10-SP4-2_13_119/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62902 - in /branches/SuSE-SLE-10-SP4-Branch/yast2: VERSION library/system/src/Kernel.ycp package/yast2.changes
by lslezak＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: lslezak Date: Thu Nov 25 16:47:13 2010 New Revision: 62902 URL: http://svn.opensuse.org/viewcvs/yast?rev=62902&view=rev Log: - fix the previous problem (bnc#526461) also for 64-bit systems (x86_64) - 2.13.119 Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/VERSION branches/SuSE-SLE-10-SP4-Branch/yast2/library/system/src/Kernel.ycp branches/SuSE-SLE-10-SP4-Branch/yast2/package/yast2.changes Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/yast2/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/yast2/VERSION Thu Nov 25 16:47:13 2010 @@ -1 +1 @@ -2.13.118 +2.13.119 Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/library/system/src/Kernel.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/yast2/library/system/src/Kernel.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/yast2/library/system/src/Kernel.ycp Thu Nov 25 16:47:13 2010 @@ -427,8 +427,16 @@ { if (xen) { - y2milestone("Adding Xen PV drivers: xen-kmp-default"); - kernel_packages = add(kernel_packages, "xen-kmp-default"); + if (contains(kernel_packages, "kernel-smp")) + { + y2milestone("Adding Xen PV drivers: xen-kmp-smp"); + kernel_packages = add(kernel_packages, "xen-kmp-smp"); + } + else + { + y2milestone("Adding Xen PV drivers: xen-kmp-default"); + kernel_packages = add(kernel_packages, "xen-kmp-default"); + } } } else if (Arch::alpha ()) Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/yast2/package/yast2.changes Thu Nov 25 16:47:13 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 25 15:43:17 UTC 2010 - lslezak(a)suse.cz + +- fix the previous problem (bnc#526461) also for 64-bit + systems (x86_64) +- 2.13.119 + +------------------------------------------------------------------- Wed Oct 13 07:52:33 UTC 2010 - lslezak(a)suse.cz - install xen-kmp-smp (instead of xen-kmp-default) when kernel-smp -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62901 - in /trunk/ncurses/src: NCTextPad.cc ncursesw.cc
by gs＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: gs Date: Thu Nov 25 16:29:58 2010 New Revision: 62901 URL: http://svn.opensuse.org/viewcvs/yast?rev=62901&view=rev Log: set ext_color from cchar_t to 0 (bnc#652240) Modified: trunk/ncurses/src/NCTextPad.cc trunk/ncurses/src/ncursesw.cc Modified: trunk/ncurses/src/NCTextPad.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTextPad.cc?rev=629… ============================================================================== --- trunk/ncurses/src/NCTextPad.cc (original) +++ trunk/ncurses/src/NCTextPad.cc Thu Nov 25 16:29:58 2010 @@ -106,7 +106,9 @@ bkgdset( parw.widgetStyle().data ); } else + { add_attr_char( curs.L, curs.C ); + } } } @@ -349,8 +351,13 @@ wchar_t wch[2]; wch[0] = key; wch[1] = L'\0'; - + setcchar( &cchar, wch, attr, color, NULL ); +// libncurses6 enables ext_color from struct cchar_t (see curses.h). +// Set ext_color to 0 to respect the settings got from attr_get (bnc#652240). +#if NCURSES_EXT_COLORS==20100109 + cchar.ext_color = 0; +#endif ins_wch( curs.L, curs.C++, &cchar ); return true; @@ -487,6 +494,11 @@ wch[1] = L'\0'; setcchar( &cchar, wch, attr, color, NULL ); +// libncurses6 enables ext_color from struct cchar_t (see curses.h). +// Set ext_color to 0 to respect the settings got from attr_get (bcn#652240). +#if NCURSES_EXT_COLORS==20100109 + cchar.ext_color = 0; +#endif ins_wch( cl, cc++, &cchar ); } Modified: trunk/ncurses/src/ncursesw.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/ncursesw.cc?rev=6290… ============================================================================== --- trunk/ncurses/src/ncursesw.cc (original) +++ trunk/ncurses/src/ncursesw.cc Thu Nov 25 16:29:58 2010 @@ -137,6 +137,11 @@ int ret = mvwin_wch( w, y, x, combined ); combined->attr = combined->attr & ( A_CHARTEXT | A_ALTCHARSET ); +// libncurses6 enables ext_color from struct cchar_t (see curses.h). +// Set ext_color to 0 to respect the settings got from mvwin_wch (bnc#652240). +#if NCURSES_EXT_COLORS==20100109 + combined->ext_color = 0; +#endif return ret; } @@ -145,7 +150,11 @@ { int ret = win_wch( w, combined ); combined->attr = combined->attr & ( A_CHARTEXT | A_ALTCHARSET ); - +// libncurses6 enables ext_color from struct cchar_t (see curses.h). +// Set ext_color to 0 to respect the settings got from win_wch (bnc#652240). +#if NCURSES_EXT_COLORS==20100109 + combined->ext_color = 0; +#endif return ret; } @@ -162,7 +171,7 @@ { cchar_t combined; ret = in_wchar( y, x, &combined ); - + if ( ret == OK ) { ret = add_wch( &combined ); @@ -191,7 +200,7 @@ ret = add_wch( &combined ); } } - + return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62900 - in /trunk/ncurses/src: NCApplication.cc NCPadWidget.cc NCstyle.h NCurses.h
by gs＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: gs Date: Thu Nov 25 16:29:18 2010 New Revision: 62900 URL: http://svn.opensuse.org/viewcvs/yast?rev=62900&view=rev Log: correct include <ncursesw/curses.h> Modified: trunk/ncurses/src/NCApplication.cc trunk/ncurses/src/NCPadWidget.cc trunk/ncurses/src/NCstyle.h trunk/ncurses/src/NCurses.h Modified: trunk/ncurses/src/NCApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCApplication.cc?rev… ============================================================================== --- trunk/ncurses/src/NCApplication.cc (original) +++ trunk/ncurses/src/NCApplication.cc Thu Nov 25 16:29:18 2010 @@ -17,7 +17,7 @@ /-*/ -#include <curses.h> +#include <ncursesw/curses.h> #define YUILogComponent "ncurses" #include <YUILog.h> Modified: trunk/ncurses/src/NCPadWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPadWidget.cc?rev=6… ============================================================================== --- trunk/ncurses/src/NCPadWidget.cc (original) +++ trunk/ncurses/src/NCPadWidget.cc Thu Nov 25 16:29:18 2010 @@ -403,6 +403,8 @@ if ( !win ) return; + yuiDebug() << "wRedraw called for: " << win << endl; + const NCstyle::StWidget & style( frameStyle() ); win->bkgdset( style.plain ); Modified: trunk/ncurses/src/NCstyle.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCstyle.h?rev=62900&… ============================================================================== --- trunk/ncurses/src/NCstyle.h (original) +++ trunk/ncurses/src/NCstyle.h Thu Nov 25 16:29:18 2010 @@ -19,7 +19,7 @@ #ifndef NCstyle_h #define NCstyle_h -#include <ncurses.h> +#include <ncursesw/ncurses.h> #include <iosfwd> #include <string> Modified: trunk/ncurses/src/NCurses.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCurses.h?rev=62900&… ============================================================================== --- trunk/ncurses/src/NCurses.h (original) +++ trunk/ncurses/src/NCurses.h Thu Nov 25 16:29:18 2010 @@ -28,7 +28,7 @@ #include <YWidget.h> #include <YMenuItem.h> -#include <curses.h> /* curses.h: #define NCURSES_CH_T cchar_t */ +#include <ncursesw/curses.h> /* curses.h: #define NCURSES_CH_T cchar_t */ #include <wchar.h> #include "ncursesw.h" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62899 - /tags/branch-Code-11-2_17_78_4/network/
by mzugec＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: mzugec Date: Thu Nov 25 15:19:01 2010 New Revision: 62899 URL: http://svn.opensuse.org/viewcvs/yast?rev=62899&view=rev Log: Created tag branch-Code-11-2_17_78_4 for network Added: tags/branch-Code-11-2_17_78_4/network/ - copied from r62898, branches/SuSE-Code-11-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62898 - /tags/branch-Code-11-2_17_78_4/
by mzugec＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: mzugec Date: Thu Nov 25 15:18:59 2010 New Revision: 62898 URL: http://svn.opensuse.org/viewcvs/yast?rev=62898&view=rev Log: Created tag branch-Code-11-2_17_78_4 Added: tags/branch-Code-11-2_17_78_4/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62897 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/lan/YaPI/NETWORK.pm yast2-network.spec.in
by mzugec＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: mzugec Date: Thu Nov 25 15:18:51 2010 New Revision: 62897 URL: http://svn.opensuse.org/viewcvs/yast?rev=62897&view=rev Log: reverted previous YaPI change (see bnc#624655c#14) 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/YaPI/NETWORK.pm branches/SuSE-Code-11-Branch/network/yast2-network.spec.in Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/V… ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Thu Nov 25 15:18:51 2010 @@ -1 +1 @@ -2.17.78.3 +2.17.78.4 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/p… ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Thu Nov 25 15:18:51 2010 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Nov 25 15:02:53 CET 2010 - mzugec(a)suse.cz + +- reverted previous YaPI change (see bnc#624655c#14) +- 2.17.78.4 + +------------------------------------------------------------------- +Thu Oct 7 21:54:29 CEST 2010 - ro(a)suse.de + +- add directory to filelist to fix build + +------------------------------------------------------------------- Fri Sep 3 15:29:37 CEST 2010 - mzugec(a)suse.cz - Proxy: correctly enclose user:password into quotes (bnc#616695) Modified: branches/SuSE-Code-11-Branch/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/lan/YaPI/NETWORK.pm (original) +++ branches/SuSE-Code-11-Branch/network/src/lan/YaPI/NETWORK.pm Thu Nov 25 15:18:51 2010 @@ -52,8 +52,7 @@ my %ret = ('interfaces'=>\%interfaces, 'routes'=>{'default'=>{'via'=>Routing->GetGateway()}}, 'dns'=>{'nameservers'=>\@{DNS->nameservers}, 'searches'=>\@{DNS->searchlist}}, - 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain, 'dhcp_hostname'=>DNS->dhcp_hostname} -# 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} + 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} ); return \%ret; } @@ -97,7 +96,6 @@ DNS->Read(); DNS->hostname($args->{'hostname'}->{'name'}); DNS->domain($args->{'hostname'}->{'domain'}); - DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); DNS->modified(1); DNS->Write(); return $ret; Modified: branches/SuSE-Code-11-Branch/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/y… ============================================================================== --- branches/SuSE-Code-11-Branch/network/yast2-network.spec.in (original) +++ branches/SuSE-Code-11-Branch/network/yast2-network.spec.in Thu Nov 25 15:18:51 2010 @@ -77,6 +77,7 @@ @clientdir@/*.ycp @moduledir@/*.ycp @moduledir@/*.ybc +%dir @moduledir@/YaPI/ @moduledir@/YaPI/NETWORK.pm @desktopdir@/*.desktop @scrconfdir@/*.scr -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62896 - /tags/branch-SLE-10-SP4-2_13_26/sound/
by lslezak＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: lslezak Date: Thu Nov 25 14:25:52 2010 New Revision: 62896 URL: http://svn.opensuse.org/viewcvs/yast?rev=62896&view=rev Log: Created tag branch-SLE-10-SP4-2_13_26 for sound Added: tags/branch-SLE-10-SP4-2_13_26/sound/ - copied from r62895, branches/SuSE-SLE-10-SP4-Branch/sound/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62895 - /tags/branch-SLE-10-SP4-2_13_26/
by lslezak＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: lslezak Date: Thu Nov 25 14:25:49 2010 New Revision: 62895 URL: http://svn.opensuse.org/viewcvs/yast?rev=62895&view=rev Log: Created tag branch-SLE-10-SP4-2_13_26 Added: tags/branch-SLE-10-SP4-2_13_26/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62894 - in /branches/SuSE-SLE-10-SP4-Branch/sound: VERSION data/sndcards.ycp package/yast2-sound.changes
by lslezak＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: lslezak Date: Thu Nov 25 14:24:51 2010 New Revision: 62894 URL: http://svn.opensuse.org/viewcvs/yast?rev=62894&view=rev Log: - added PCI ID for Intel Cougar Point PCH (bnc#653787) - 2.13.26 Modified: branches/SuSE-SLE-10-SP4-Branch/sound/VERSION branches/SuSE-SLE-10-SP4-Branch/sound/data/sndcards.ycp branches/SuSE-SLE-10-SP4-Branch/sound/package/yast2-sound.changes Modified: branches/SuSE-SLE-10-SP4-Branch/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/sound/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/sound/VERSION Thu Nov 25 14:24:51 2010 @@ -1 +1 @@ -2.13.25 +2.13.26 Modified: branches/SuSE-SLE-10-SP4-Branch/sound/data/sndcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/sound/data/sndcards.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/sound/data/sndcards.ycp Thu Nov 25 14:24:51 2010 @@ -515,6 +515,7 @@ "ICH8 (HDA), Intel", "ICH9 (HDA), Intel", "ICH10 (HDA), Intel", + "PCH (HDA), Intel", "SB450, ATI", "VT8251, VIA", "M5461, ULI", @@ -900,6 +901,8 @@ 2049 : 48 ], 32902 : $[ + 7200 : 78, + 7456 : 78, 9237 : 38, 9238 : 39, 9253 : 38, Modified: branches/SuSE-SLE-10-SP4-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/sound/package/yast2-sound.changes Thu Nov 25 14:24:51 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 25 13:12:31 UTC 2010 - lslezak(a)suse.cz + +- added PCI ID for Intel Cougar Point PCH (bnc#653787) +- 2.13.26 + +------------------------------------------------------------------- Fri Jul 10 13:48:02 CEST 2009 - lslezak(a)suse.cz - set "iSpeaker" channel volume (#251844) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62893 - /tags/stable-2_18_6/mail/
by varkoly＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: varkoly Date: Thu Nov 25 12:44:57 2010 New Revision: 62893 URL: http://svn.opensuse.org/viewcvs/yast?rev=62893&view=rev Log: Created tag stable-2_18_6 for mail Added: tags/stable-2_18_6/mail/ - copied from r62892, trunk/mail/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62892 - in /trunk/mail: VERSION package/yast2-mail.changes
by varkoly＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: varkoly Date: Thu Nov 25 12:44:23 2010 New Revision: 62892 URL: http://svn.opensuse.org/viewcvs/yast?rev=62892&view=rev Log: New build verison Modified: trunk/mail/VERSION trunk/mail/package/yast2-mail.changes Modified: trunk/mail/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/VERSION?rev=62892&r1=62891&… ============================================================================== --- trunk/mail/VERSION (original) +++ trunk/mail/VERSION Thu Nov 25 12:44:23 2010 @@ -1 +1 @@ -2.18.5 +2.18.6 Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Thu Nov 25 12:44:23 2010 @@ -1,3 +1,14 @@ +------------------------------------------------------------------ +Thu Nov 25 13:42:17 CET 2010 - varkoly(a)suse.de + +- bnc#649549 - yast2-mail doesn't enable and start cyrus-imapd + +------------------------------------------------------------------ +Thu Aug 12 15:05:52 UTC 2010 - varkoly(a)novell.com + +- bnc#586486 Multiple Issues with Yast Configuration of Postfix MTA for Relaying over SMTP +- Enhance warning if use advanced configuration + ------------------------------------------------------------------- Wed Apr 7 12:52:37 UTC 2010 - varkoly(a)novell.com -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62891 - in /trunk/mail/src: Mail.ycp mail.ycp
by varkoly＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: varkoly Date: Thu Nov 25 12:33:23 2010 New Revision: 62891 URL: http://svn.opensuse.org/viewcvs/yast?rev=62891&view=rev Log: bnc#649549 - yast2-mail doesn't enable and start cyrus-imapd Modified: trunk/mail/src/Mail.ycp trunk/mail/src/mail.ycp Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=62891&r1=6… ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Thu Nov 25 12:33:23 2010 @@ -253,6 +253,7 @@ */ global define string ProbePackages () ``{ string message = ""; + boolean newcyrus = false; install_packages = []; remove_packages = []; @@ -302,11 +303,17 @@ install_packages = add(install_packages,"cyrus-imapd"); // Translators: popup message part, ends with a newline message = message + _("Cyrus-imapd, an IMAP server, will be installed.\n"); + newcyrus = true; } if( install_packages != [] ) { Package::DoInstall(install_packages); } + if( newcyrus ) + { + Service::Enable("cyrus") + Service::Start("cyrus") + } return message; } @@ -742,16 +749,19 @@ } else if (connection_type == `permanent) { + SCR::Write (.sysconfig.postfix.POSTFIX_NODAEMON, "no"); SCR::Write (nc_nd, "no"); SCR::Write (ex_di, "no"); } else if (connection_type == `dialup) { + SCR::Write (.sysconfig.postfix.POSTFIX_NODAEMON, "no"); SCR::Write (nc_nd, "yes"); SCR::Write (ex_di, "yes"); } else if (connection_type == `none) { + SCR::Write (.sysconfig.postfix.POSTFIX_NODAEMON, "no"); SCR::Write (nc_nd, "yes"); SCR::Write (ex_di, "no"); } @@ -821,6 +831,30 @@ } else if (mta == `postfix) { + if( smtp_use_TLS != "no" ) + { + string oms = outgoing_mail_server; + string oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]:.*") ? regexpsub (oms, ".(.*).:.*", "\\1") : oms; + string oms_port = regexpmatch (oms, "[[][^][]*[]]:.*") ? regexpsub (oms, ".*.:(.*)", "\\1") : ""; + + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]") ? regexpsub (oms, ".(.*).", "\\1") : oms; + } + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, ".*:.*") ? regexpsub (oms, "(.*):.*", "\\1") : oms; + oms_port = regexpmatch (oms, ".*:.*") ? regexpsub (oms, ".*:(.*)", "\\1") : ""; + } + if( oms_port != "" ) + { + outgoing_mail_server = "[" + oms_no_brackets + "]:" + oms_port; + } + else + { + outgoing_mail_server = "[" + oms_no_brackets + "]"; + } + } SCR::Write (.sysconfig.postfix.POSTFIX_RELAYHOST, outgoing_mail_server); SCR::Write (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT, smtp_use_TLS); } @@ -962,7 +996,10 @@ { enable_smtp_auth = size (smtp_auth) > 0; } - + if ( smtp_auth[0,"server"]:"" != outgoing_mail_server ) + { + smtp_auth[0,"server"]=outgoing_mail_server; + } if (mta == `sendmail) { SCR::Write (.mail.sendmail.auth.accounts, smtp_auth); Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=62891&r1=6… ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Thu Nov 25 12:33:23 2010 @@ -62,7 +62,8 @@ term tskip_ask = `Left(`CheckBox(`id(`skip_ask), _("Skip this page in the future"))); string status = _("Mail server is not configured.")+"\n"+ _("Select configuration type according your personal needs")+"\n"+ - _("If you want to use sendmail as your MTA you have to use Standard configuration."); + _("If you want to use sendmail as your MTA you have to use Standard configuration.")+ + _("The Advanced configuration use LDAP as backend and will configure your system as LDAP-Client and setup an LDAP-Server if necessary."); if( first ) { tskip_ask = `VSpacing(1); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62890 - /tags/branch-SLE-10-SP4-2_13_193/packager/
by jsrain＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: jsrain Date: Thu Nov 25 10:27:55 2010 New Revision: 62890 URL: http://svn.opensuse.org/viewcvs/yast?rev=62890&view=rev Log: Created tag branch-SLE-10-SP4-2_13_193 for packager Added: tags/branch-SLE-10-SP4-2_13_193/packager/ (props changed) - copied from r62889, branches/SuSE-SLE-10-SP4-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62889 - /tags/branch-SLE-10-SP4-2_13_193/
by jsrain＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: jsrain Date: Thu Nov 25 10:27:53 2010 New Revision: 62889 URL: http://svn.opensuse.org/viewcvs/yast?rev=62889&view=rev Log: Created tag branch-SLE-10-SP4-2_13_193 Added: tags/branch-SLE-10-SP4-2_13_193/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62888 - in /branches/SuSE-SLE-10-SP4-Branch/packager: VERSION package/yast2-packager.changes src/clients/inst_kickoff.ycp
by jsrain＠svn2.opensuse.org 25 Nov '10

25 Nov '10

Author: jsrain Date: Thu Nov 25 10:27:43 2010 New Revision: 62888 URL: http://svn.opensuse.org/viewcvs/yast?rev=62888&view=rev Log: fixed detection of virtio devices (bnc#649755) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Thu Nov 25 10:27:43 2010 @@ -1 +1 @@ -2.13.192 +2.13.193 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes Thu Nov 25 10:27:43 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 25 10:18:19 CET 2010 - jsrain(a)suse.cz + +- fixed detection of virtio devices (bnc#649755) +- 2.13.193 + +------------------------------------------------------------------- Fri Nov 12 15:30:17 UTC 2010 - lslezak(a)suse.cz - source manager - changed "Local Directory" radio button label Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Thu Nov 25 10:27:43 2010 @@ -93,11 +93,12 @@ map out = (map)SCR::Execute (.target.bash_output, "LANG=C /sbin/lspci -mm -n"); list<string> devices = splitstring (out["stdout"]:"", "\n"); foreach (string d, devices, { - if (! regexpmatch (d, "^[0-9a-zA-Z.:]+[ \t]+\"[0-9a-fA-F]+\"[ \t]+\"[0-9a-fA-F]+\".*$")) { + // note: in case of porting to SLES11 or newer code base, adapting to changed lspci output is needed + if (! regexpmatch (d, "^[0-9a-zA-Z.:]+[ \t]+\"Class [0-9a-fA-F]+\"[ \t]+\"[0-9a-fA-F]+\"[ \t]+\"[0-9a-fA-F]+\".*$")) { continue; } - string vendor = regexpsub (d, "^[0-9a-zA-Z.:]+[ \t]+\"([0-9a-fA-F]+)\"[ \t]+\"([0-9a-fA-F]+)\".*$", "\\2"); - string device = regexpsub (d, "^[0-9a-zA-Z.:]+[ \t]+\"([0-9a-fA-F]+)\"[ \t]+\"([0-9a-fA-F]+)\".*$", "\\1"); + string vendor = regexpsub (d, "^[0-9a-zA-Z.:]+[ \t]+\"Class [0-9a-fA-F]+\"[ \t]+\"([0-9a-fA-F]+)\"[ \t]+\"([0-9a-fA-F]+)\".*$", "\\1"); + string device = regexpsub (d, "^[0-9a-zA-Z.:]+[ \t]+\"Class [0-9a-fA-F]+\"[ \t]+\"([0-9a-fA-F]+)\"[ \t]+\"([0-9a-fA-F]+)\".*$", "\\2"); foreach (string m, modules_db[vendor, device]:[], { Initrd::AddModule (m, ""); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62887 - in /branches/SuSE-SLE-10-SP4-Branch/autoinstallation: VERSION package/autoyast2.changes src/modules/AutoinstClone.ycp
by ug＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: ug Date: Wed Nov 24 17:45:54 2010 New Revision: 62887 URL: http://svn.opensuse.org/viewcvs/yast?rev=62887&view=rev Log: clone devices by-path on s390 (bnc#591603). 2.13.105 Modified: branches/SuSE-SLE-10-SP4-Branch/autoinstallation/VERSION branches/SuSE-SLE-10-SP4-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-SLE-10-SP4-Branch/autoinstallation/src/modules/AutoinstClone.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/autoinstallation/VERSION Wed Nov 24 17:45:54 2010 @@ -1 +1 @@ -2.13.104 +2.13.105 Modified: branches/SuSE-SLE-10-SP4-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/autoinstallation/package/autoyast2.changes Wed Nov 24 17:45:54 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 24 17:45:02 CET 2010 - ug(a)suse.de + +- clone devices by-path on s390 (bnc#591603) +- 2.13.105 + +------------------------------------------------------------------- Tue Oct 26 10:48:11 CEST 2010 - ug(a)suse.de - reusing a lot of partitions can take ages to calculate Modified: branches/SuSE-SLE-10-SP4-Branch/autoinstallation/src/modules/AutoinstClone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/autoinstallation/src/modules/AutoinstClone.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/autoinstallation/src/modules/AutoinstClone.ycp Wed Nov 24 17:45:54 2010 @@ -30,6 +30,7 @@ import "Storage"; import "Partitions"; import "Report"; + import "Arch"; include "autoinstall/xml.ycp"; @@ -237,7 +238,12 @@ map drive = $[]; drive["partitions"] = partitions; - drive["device"] = k; + if( Arch::s390() ) { + drive["device"] = "/dev/disk/by-path/" + v["udev_path"]:k; + y2milestone("s390 found. Setting device to by-path: %1", drive["device"]:""); + } else { + drive["device"] = k; + } if( v["type"]:`CT_UNKNOWN==`CT_LVM) { drive["pesize"] = sformat("%1M", v["pesize"]:1 / (1024*1024) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62886 - in /branches/SuSE-Code-11-SP2-Branch/autoinstallation: package/autoyast2.changes src/modules/AutoinstPartPlan.ycp
by ug＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: ug Date: Wed Nov 24 17:38:26 2010 New Revision: 62886 URL: http://svn.opensuse.org/viewcvs/yast?rev=62886&view=rev Log: clone devices by-path on s390 (bnc#591603) Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes Wed Nov 24 17:38:26 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 24 17:38:02 CET 2010 - ug(a)suse.de + +- clone devices by-path on s390 (bnc#591603) + +------------------------------------------------------------------- Fri Apr 9 11:30:37 CEST 2010 - ug(a)suse.de - reuse of a physical device for an LVM fixed (bnc#591601) Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp Wed Nov 24 17:38:26 2010 @@ -23,7 +23,7 @@ import "StorageDevices"; import "Storage"; import "Partitions"; - + import "Arch"; /** * The general idea with this moduls is that it manages a single @@ -507,7 +507,12 @@ }); } drive["partitions"] = partitions; - drive["device"] = k; + if( Arch::s390() ) { + drive["device"] = "/dev/disk/by-path/" + v["udev_path"]:k; + y2milestone("s390 found. Setting device to by-path: %1", drive["device"]:""); + } else { + drive["device"] = k; + } if( v["type"]:`CT_UNKNOWN==`CT_LVM) { drive["pesize"] = sformat("%1M", v["pesize"]:1 / (1024*1024) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62885 - /branches/SuSE-Code-11-SP2-Branch/autoinstallation/
by ug＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: ug Date: Wed Nov 24 17:35:26 2010 New Revision: 62885 URL: http://svn.opensuse.org/viewcvs/yast?rev=62885&view=rev Log: - branch Added: branches/SuSE-Code-11-SP2-Branch/autoinstallation/ (props changed) - copied from r62884, branches/SuSE-Code-11-SP1-Branch/autoinstallation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62884 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/AutoinstPartPlan.ycp
by ug＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: ug Date: Wed Nov 24 17:25:11 2010 New Revision: 62884 URL: http://svn.opensuse.org/viewcvs/yast?rev=62884&view=rev Log: clone devices by-path on s390 (bnc#591603) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Nov 24 17:25:11 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 24 17:19:09 CET 2010 - ug(a)suse.de + +- clone devices by-path on s390 (bnc#591603) + +------------------------------------------------------------------- Tue Oct 12 13:32:37 UTC 2010 - lslezak(a)suse.cz - don't use obsoleted inst_packages.ycp client, use PackagesUI.ycp Modified: trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp Wed Nov 24 17:25:11 2010 @@ -23,7 +23,7 @@ import "StorageDevices"; import "Storage"; import "Partitions"; - + import "Arch"; /** * The general idea with this moduls is that it manages a single @@ -507,7 +507,12 @@ }); } drive["partitions"] = partitions; - drive["device"] = k; + if( Arch::s390() ) { + drive["device"] = "/dev/disk/by-path/" + v["udev_path"]:k; + y2milestone("s390 found. Setting device to by-path: %1", drive["device"]:""); + } else { + drive["device"] = k; + } if( v["type"]:`CT_UNKNOWN==`CT_LVM) { drive["pesize"] = sformat("%1M", v["pesize"]:1 / (1024*1024) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62883 - in /branches/SuSE-Code-11-SP1-Branch/qt: VERSION.cmake package/yast2-qt.changes src/QY2StyleEditor.cc src/YQApplication.cc src/YQUI_builtins.cc
by tgoettlicher＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: tgoettlicher Date: Wed Nov 24 15:08:48 2010 New Revision: 62883 URL: http://svn.opensuse.org/viewcvs/yast?rev=62883&view=rev Log: fixed hanging file chooser dialog (bnc #642270) Modified: branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes branches/SuSE-Code-11-SP1-Branch/qt/src/QY2StyleEditor.cc branches/SuSE-Code-11-SP1-Branch/qt/src/YQApplication.cc branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI_builtins.cc Modified: branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/VE… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake Wed Nov 24 15:08:48 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "11") +SET(VERSION_PATCH "12") Modified: branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/pa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes Wed Nov 24 15:08:48 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 24 14:25:12 CET 2010 - tgoettlicher(a)suse.de + +- fixed hanging file chooser dialog (bnc #642270) +- V 2.18.12 + +------------------------------------------------------------------- Tue Apr 20 12:45:13 CEST 2010 - tgoettlicher(a)suse.de - Fixed untranslated context menu (bnc #580165) Modified: branches/SuSE-Code-11-SP1-Branch/qt/src/QY2StyleEditor.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/sr… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/src/QY2StyleEditor.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/src/QY2StyleEditor.cc Wed Nov 24 15:08:48 2010 @@ -77,7 +77,8 @@ QString fileName = QFileDialog::getOpenFileName( this, // parent QString( "Load stylesheet ..." ), // caption QY2Styler::styler()->themeDir(), // dir - QString( "*.qss") ); // filter + QString( "*.qss"), 0, // filter + QFileDialog::DontUseNativeDialog ); if ( fileName.isEmpty() ) return; // user clicked cancel Modified: branches/SuSE-Code-11-SP1-Branch/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/sr… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/src/YQApplication.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/src/YQApplication.cc Wed Nov 24 15:08:48 2010 @@ -472,7 +472,7 @@ QString dirName = QFileDialog::getExistingDirectory( 0, // parent fromUTF8( headline ) , // caption - fromUTF8( startDir )); // dir + fromUTF8( startDir ), QFileDialog::DontUseNativeDialog); // dir busyCursor(); @@ -491,7 +491,8 @@ QFileDialog::getOpenFileName( 0, // parent fromUTF8( headline ) , // caption fromUTF8( startWith ), // dir - fromUTF8( filter )); // filter + fromUTF8( filter ), // filter + 0, QFileDialog::DontUseNativeDialog); busyCursor(); return toUTF8( fileName ); @@ -543,7 +544,7 @@ fileName = QFileDialog::getSaveFileName( parent, // parent headline, // caption startWith, // dir - filter ); // filter + filter, 0, QFileDialog::DontUseNativeDialog ); // filter if ( fileName.isEmpty() ) // this includes fileName.isNull() return QString::null; Modified: branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/sr… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI_builtins.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI_builtins.cc Wed Nov 24 15:08:48 2010 @@ -313,7 +313,9 @@ QFileDialog::getSaveFileName( parent, "Select Macro File to Record to", DEFAULT_MACRO_FILE_NAME, // startWith - "*.ycp" // filter + "*.ycp", // filter + 0, // selectedFilter + QFileDialog::DontUseNativeDialog ); if ( ! filename.isEmpty() ) // file selection dialog has been cancelled @@ -339,7 +341,7 @@ QFileDialog::getOpenFileName( parent, "Select Macro File to Play", DEFAULT_MACRO_FILE_NAME, // startWith - "*.ycp" ); + "*.ycp", 0, QFileDialog::DontUseNativeDialog ); busyCursor(); if ( ! filename.isEmpty() ) // file selection dialog has been cancelled -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62882 - /tags/branch-SLE-10-SP4-2_13_71/ncurses/
by gs＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: gs Date: Wed Nov 24 11:43:52 2010 New Revision: 62882 URL: http://svn.opensuse.org/viewcvs/yast?rev=62882&view=rev Log: Created tag branch-SLE-10-SP4-2_13_71 for ncurses Added: tags/branch-SLE-10-SP4-2_13_71/ncurses/ - copied from r62881, branches/SuSE-SLE-10-SP4-Branch/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62881 - /tags/branch-SLE-10-SP4-2_13_71/
by gs＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: gs Date: Wed Nov 24 11:43:51 2010 New Revision: 62881 URL: http://svn.opensuse.org/viewcvs/yast?rev=62881&view=rev Log: Created tag branch-SLE-10-SP4-2_13_71 Added: tags/branch-SLE-10-SP4-2_13_71/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62880 - in /branches/SuSE-SLE-10-SP4-Branch/ncurses: VERSION package/yast2-ncurses.changes src/NCRichText.cc
by gs＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: gs Date: Wed Nov 24 11:43:44 2010 New Revision: 62880 URL: http://svn.opensuse.org/viewcvs/yast?rev=62880&view=rev Log: Bugfix for RichText widget: show complete license text (bnc #655453), show DOS file format correctly Modified: branches/SuSE-SLE-10-SP4-Branch/ncurses/VERSION branches/SuSE-SLE-10-SP4-Branch/ncurses/package/yast2-ncurses.changes branches/SuSE-SLE-10-SP4-Branch/ncurses/src/NCRichText.cc Modified: branches/SuSE-SLE-10-SP4-Branch/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/ncurses/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/ncurses/VERSION Wed Nov 24 11:43:44 2010 @@ -1 +1 @@ -2.13.70 +2.13.71 Modified: branches/SuSE-SLE-10-SP4-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/ncurses/package/yast2-ncurses.changes Wed Nov 24 11:43:44 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 24 11:13:34 CET 2010 - gs(a)suse.de + +- Bugfix for RichText widget: show complete license text + (bnc #655453), show DOS file format correctly +- 2.13.71 + +------------------------------------------------------------------- Fri Nov 27 19:22:52 CET 2009 - ma(a)suse.de - Work around 32768 lines limit in ncurses table. (bnc #550733) Modified: branches/SuSE-SLE-10-SP4-Branch/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/ncurses/src/NCRichText.cc (original) +++ branches/SuSE-SLE-10-SP4-Branch/ncurses/src/NCRichText.cc Wed Nov 24 11:43:44 2010 @@ -392,6 +392,9 @@ void NCRichText::PadPlainTXT( const wchar_t * osch, const unsigned olen ) { wstring wtxt( osch, olen ); + // resolve the entities even in PRE (#71718) + wtxt = filterEntities( wtxt ); + NCstring nctxt( wtxt ); NCtext ftext( nctxt ); @@ -404,12 +407,15 @@ const wchar_t * sch = wtxt.data(); while ( *sch ) { - myPad()->addwstr( sch, 1 ); // add one wide chararacter - cc += wcwidth(*sch); - - if ( *sch == L'\n' ) + if ( *sch != L'\r' ) // skip carriage return { - PadNL(); // add a new line + myPad()->addwstr( sch, 1 ); // add one wide chararacter + cc += wcwidth(*sch); + + if ( *sch == L'\n' ) + { + PadNL(); // add a new line + } } ++sch; } @@ -496,8 +502,11 @@ } else { - myPad()->addwstr( wch, 1 ); // add one wide chararacter - ++cc; + if ( *wch != L'\r' ) // skip carriage return + { + myPad()->addwstr( wch, 1 ); // add one wide chararacter + cc += wcwidth( *wch ); + } ++wch; } break; @@ -521,10 +530,7 @@ { SkipPreTXT( wch ); - // resolve the entities even in PRE (#71718) - wstring txt = filterEntities( wstring(swch, wch-swch) ); - - PadPlainTXT( txt.c_str (), textWidth( txt ) ); + PadPlainTXT( swch, wch - swch ); } break; } @@ -637,9 +643,12 @@ // // // METHOD NAME : NCRichText::textWidth -// METHOD TYPE : void +// METHOD TYPE : size_t // -// DESCRIPTION : +// DESCRIPTION : Get the number of columns needed to print a 'wstring'. +// Attention: only use textWidth() to calculate space, not +// for iterating through a text or to get the length of a text +// (real text length includes new lines). // size_t NCRichText::textWidth( wstring wstr ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62879 - /tags/branch-Linux-11_2-2_18_21/country/
by jsuchome＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: jsuchome Date: Wed Nov 24 11:14:54 2010 New Revision: 62879 URL: http://svn.opensuse.org/viewcvs/yast?rev=62879&view=rev Log: Created tag branch-Linux-11_2-2_18_21 for country Added: tags/branch-Linux-11_2-2_18_21/country/ - copied from r62878, branches/SuSE-Linux-11_2-Branch/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62878 - /tags/branch-Linux-11_2-2_18_21/
by jsuchome＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: jsuchome Date: Wed Nov 24 11:14:51 2010 New Revision: 62878 URL: http://svn.opensuse.org/viewcvs/yast?rev=62878&view=rev Log: Created tag branch-Linux-11_2-2_18_21 Added: tags/branch-Linux-11_2-2_18_21/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62877 - in /branches/SuSE-Linux-11_2-Branch/country: VERSION package/yast2-country.changes timezone/src/Timezone.ycp timezone/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: jsuchome Date: Wed Nov 24 11:14:46 2010 New Revision: 62877 URL: http://svn.opensuse.org/viewcvs/yast?rev=62877&view=rev Log: - call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) - 2.18.21 Modified: branches/SuSE-Linux-11_2-Branch/country/VERSION branches/SuSE-Linux-11_2-Branch/country/package/yast2-country.changes branches/SuSE-Linux-11_2-Branch/country/timezone/src/Timezone.ycp branches/SuSE-Linux-11_2-Branch/country/timezone/src/dialogs.ycp Modified: branches/SuSE-Linux-11_2-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/country/VERSION (original) +++ branches/SuSE-Linux-11_2-Branch/country/VERSION Wed Nov 24 11:14:46 2010 @@ -1 +1 @@ -2.18.20 +2.18.21 Modified: branches/SuSE-Linux-11_2-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Linux-11_2-Branch/country/package/yast2-country.changes Wed Nov 24 11:14:46 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 24 10:07:09 CET 2010 - jsuchome(a)suse.cz + +- call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) +- 2.18.21 + +------------------------------------------------------------------- Fri Oct 2 09:15:17 CEST 2009 - jsuchome(a)suse.cz - YaPI: check keys in args map Modified: branches/SuSE-Linux-11_2-Branch/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/country/timezone/src/Timezone.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/country/timezone/src/Timezone.ycp Wed Nov 24 11:14:46 2010 @@ -59,6 +59,8 @@ */ global boolean windows_partition = false; +// if mkinitrd should be called at the end +global boolean call_mkinitrd = false; // translation of correct timezone to the one that could be shown in map widget global map <string,string> yast2zonetab = $[ @@ -359,6 +361,14 @@ return; } +global boolean CallMkinitrd () { + + y2milestone ("calling mkinitrd..."); + SCR::Execute (.target.bash, "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>> /var/log/YaST2/y2logmkinitrd"); + y2milestone ("... done"); + return true; +} + /** * Set the new time and date given by user */ @@ -733,6 +743,11 @@ y2milestone( "Save Saved data for timezone: <%1>", timezone ); + if (call_mkinitrd && !Stage::initial ()) + { + CallMkinitrd (); + } + return; } Modified: branches/SuSE-Linux-11_2-Branch/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/country/timezone/src/dialogs.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/country/timezone/src/dialogs.ycp Wed Nov 24 11:14:46 2010 @@ -346,6 +346,13 @@ } else { + // in case of local time, we need to call mkinitrd (after setting timezone) + if (Timezone::hwclock == "--localtime" && !Stage::initial ()) + { + Timezone::Set (Timezone::timezone, true); + Timezone::call_mkinitrd = true; + } + Timezone::SetTime( year, month, day, hour, minute, second ); } } @@ -385,6 +392,7 @@ boolean changed_time = false; string timezone = Timezone::timezone; string timezone_old = timezone; + string timezone_initial = timezone; string hwclock = Timezone::hwclock; y2milestone ( "timezone_old %1", timezone_old ); @@ -805,6 +813,12 @@ Timezone::user_decision = true; Timezone::user_hwclock = true; Timezone::ntp_used = ntp_used; + // See bnc#638185c5: refresh_initrd should be called if HWCLOCK is changed (--localtime <-> --utc) and/or + // if --localtime is set and TIMEZONE will be changed. + if (hwclock_s != hwclock_s_initial || (hwclock_s == `hwclock_localtime && timezone != timezone_initial)) + { + Timezone::call_mkinitrd = true; + } } } } until ( ret == `next || ret == `back || ret == `cancel ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62876 - /tags/branch-Linux-11_3-2_19_20/country/
by jsuchome＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: jsuchome Date: Wed Nov 24 11:09:40 2010 New Revision: 62876 URL: http://svn.opensuse.org/viewcvs/yast?rev=62876&view=rev Log: Created tag branch-Linux-11_3-2_19_20 for country Added: tags/branch-Linux-11_3-2_19_20/country/ - copied from r62875, branches/SuSE-Linux-11_3-Branch/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62875 - /tags/branch-Linux-11_3-2_19_20/
by jsuchome＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: jsuchome Date: Wed Nov 24 11:09:36 2010 New Revision: 62875 URL: http://svn.opensuse.org/viewcvs/yast?rev=62875&view=rev Log: Created tag branch-Linux-11_3-2_19_20 Added: tags/branch-Linux-11_3-2_19_20/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62874 - in /branches/SuSE-Linux-11_3-Branch/country: VERSION package/yast2-country.changes timezone/src/Timezone.ycp timezone/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 24 Nov '10

24 Nov '10

Author: jsuchome Date: Wed Nov 24 11:09:26 2010 New Revision: 62874 URL: http://svn.opensuse.org/viewcvs/yast?rev=62874&view=rev Log: - call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) - 2.19.20 Modified: branches/SuSE-Linux-11_3-Branch/country/VERSION branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp Modified: branches/SuSE-Linux-11_3-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/VERSION (original) +++ branches/SuSE-Linux-11_3-Branch/country/VERSION Wed Nov 24 11:09:26 2010 @@ -1 +1 @@ -2.19.19 +2.19.20 Modified: branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes Wed Nov 24 11:09:26 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 24 10:06:31 CET 2010 - jsuchome(a)suse.cz + +- call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) +- 2.19.20 + +------------------------------------------------------------------- Tue Aug 31 11:43:09 CEST 2010 - jsuchome(a)suse.cz - mkinitrd call is needed after time change with localtime Modified: branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp Wed Nov 24 11:09:26 2010 @@ -59,6 +59,8 @@ */ global boolean windows_partition = false; +// if mkinitrd should be called at the end +global boolean call_mkinitrd = false; // translation of correct timezone to the one that could be shown in map widget global map <string,string> yast2zonetab = $[ @@ -754,6 +756,11 @@ y2milestone( "Save Saved data for timezone: <%1>", timezone ); + if (call_mkinitrd && !Stage::initial ()) + { + CallMkinitrd (); + } + return; } Modified: branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp Wed Nov 24 11:09:26 2010 @@ -386,17 +386,10 @@ if (Timezone::hwclock == "--localtime" && !Stage::initial ()) { Timezone::Set (Timezone::timezone, true); + Timezone::call_mkinitrd = true; } Timezone::SetTime( year, month, day, hour, minute, second ); - - if (Timezone::hwclock == "--localtime" && !Stage::initial ()) - { - // busy message - Popup::ShowFeedback ("", _("Updating initrd...")); - Timezone::CallMkinitrd (); - Popup::ClearFeedback (); - } } } } @@ -439,6 +432,7 @@ boolean changed_time = false; string timezone = Timezone::timezone; string timezone_old = timezone; + string timezone_initial = timezone; string hwclock = Timezone::hwclock; y2milestone ( "timezone_old %1", timezone_old ); @@ -875,6 +869,12 @@ Timezone::user_decision = true; Timezone::user_hwclock = true; Timezone::ntp_used = ntp_used; + // See bnc#638185c5: refresh_initrd should be called if HWCLOCK is changed (--localtime <-> --utc) and/or + // if --localtime is set and TIMEZONE will be changed. + if (hwclock_s != hwclock_s_initial || (hwclock_s == `hwclock_localtime && timezone != timezone_initial)) + { + Timezone::call_mkinitrd = true; + } if (ntp_used && ntp_server != "") { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62873 - /tags/branch-Code-11-SP1-2_17_147/network/
by mzugec＠svn2.opensuse.org 23 Nov '10

23 Nov '10

Author: mzugec Date: Tue Nov 23 14:56:38 2010 New Revision: 62873 URL: http://svn.opensuse.org/viewcvs/yast?rev=62873&view=rev Log: Created tag branch-Code-11-SP1-2_17_147 for network Added: tags/branch-Code-11-SP1-2_17_147/network/ (props changed) - copied from r62872, branches/SuSE-Code-11-SP1-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62872 - /tags/branch-Code-11-SP1-2_17_147/
by mzugec＠svn2.opensuse.org 23 Nov '10

23 Nov '10

Author: mzugec Date: Tue Nov 23 14:56:36 2010 New Revision: 62872 URL: http://svn.opensuse.org/viewcvs/yast?rev=62872&view=rev Log: Created tag branch-Code-11-SP1-2_17_147 Added: tags/branch-Code-11-SP1-2_17_147/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62871 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION src/lan/address.ycp
by mzugec＠svn2.opensuse.org 23 Nov '10

23 Nov '10

Author: mzugec Date: Tue Nov 23 14:56:27 2010 New Revision: 62871 URL: http://svn.opensuse.org/viewcvs/yast?rev=62871&view=rev Log: allow empty IPADDR together with BOOTPROTO='static' (bnc#652091) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Tue Nov 23 14:56:27 2010 @@ -1 +1 @@ -2.17.146 +2.17.147 Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp Tue Nov 23 14:56:27 2010 @@ -454,14 +454,14 @@ if (UI::QueryWidget(`bootproto, `CurrentButton) == `static) { string ipa = (string) UI::QueryWidget (`ipaddr, `Value); - if (! IP::Check(ipa)){ + if (ipa!="" && !IP::Check(ipa)){ Popup::Error(_("No valid IP address.")); UI::SetFocus(`ipaddr); return false; } string mask=(string) UI::QueryWidget (`netmask, `Value); - if(!validPrefixOrNetmask(ipa, mask)){ + if(ipa!="" && !validPrefixOrNetmask(ipa, mask)){ Popup::Error(_("No valid netmask or prefix lenght.")); UI::SetFocus(`netmask); return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62870 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/QY2StyleEditor.cc src/YQApplication.cc src/YQUI_builtins.cc
by tgoettlicher＠svn2.opensuse.org 22 Nov '10

22 Nov '10

Author: tgoettlicher Date: Mon Nov 22 09:46:27 2010 New Revision: 62870 URL: http://svn.opensuse.org/viewcvs/yast?rev=62870&view=rev Log: disables native dialogs (bnc #642270) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/QY2StyleEditor.cc trunk/qt/src/YQApplication.cc trunk/qt/src/YQUI_builtins.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=62870&r1=62… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Mon Nov 22 09:46:27 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "3") +SET(VERSION_PATCH "4") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Mon Nov 22 09:46:27 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 22 09:40:58 CET 2010 - tgoettlicher(a)suse.de + +- disables native dialogs (bnc #642270) +- V 2.19.4 + +------------------------------------------------------------------- Mon Oct 11 10:23:07 CEST 2010 - tgoettlicher(a)suse.de - Fixed font dependency (bnc #629892) Modified: trunk/qt/src/QY2StyleEditor.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2StyleEditor.cc?rev=628… ============================================================================== --- trunk/qt/src/QY2StyleEditor.cc (original) +++ trunk/qt/src/QY2StyleEditor.cc Mon Nov 22 09:46:27 2010 @@ -98,7 +98,8 @@ QString fileName = QFileDialog::getOpenFileName( this, // parent QString( "Load stylesheet ..." ), // caption QY2Styler::styler()->themeDir(), // dir - QString( "*.qss") ); // filter + QString( "*.qss"), 0, // filter + QFileDialog::DontUseNativeDialog ); if ( fileName.isEmpty() ) return; // user clicked cancel Modified: trunk/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQApplication.cc?rev=6287… ============================================================================== --- trunk/qt/src/YQApplication.cc (original) +++ trunk/qt/src/YQApplication.cc Mon Nov 22 09:46:27 2010 @@ -501,7 +501,7 @@ QString dirName = QFileDialog::getExistingDirectory( 0, // parent fromUTF8( headline ) , // caption - fromUTF8( startDir )); // dir + fromUTF8( startDir ), QFileDialog::DontUseNativeDialog); // dir busyCursor(); @@ -520,7 +520,8 @@ QFileDialog::getOpenFileName( 0, // parent fromUTF8( headline ) , // caption fromUTF8( startWith ), // dir - fromUTF8( filter )); // filter + fromUTF8( filter ), // filter + 0, QFileDialog::DontUseNativeDialog); busyCursor(); return toUTF8( fileName ); @@ -572,7 +573,7 @@ fileName = QFileDialog::getSaveFileName( parent, // parent headline, // caption startWith, // dir - filter ); // filter + filter, 0, QFileDialog::DontUseNativeDialog ); // filter if ( fileName.isEmpty() ) // this includes fileName.isNull() return QString::null; Modified: trunk/qt/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_builtins.cc?rev=6287… ============================================================================== --- trunk/qt/src/YQUI_builtins.cc (original) +++ trunk/qt/src/YQUI_builtins.cc Mon Nov 22 09:46:27 2010 @@ -334,7 +334,9 @@ QFileDialog::getSaveFileName( parent, "Select Macro File to Record to", DEFAULT_MACRO_FILE_NAME, // startWith - "*.ycp" // filter + "*.ycp", // filter + 0, // selectedFilter + QFileDialog::DontUseNativeDialog ); if ( ! filename.isEmpty() ) // file selection dialog has been cancelled @@ -360,7 +362,7 @@ QFileDialog::getOpenFileName( parent, "Select Macro File to Play", DEFAULT_MACRO_FILE_NAME, // startWith - "*.ycp" ); + "*.ycp", 0, QFileDialog::DontUseNativeDialog ); busyCursor(); if ( ! filename.isEmpty() ) // file selection dialog has been cancelled -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62869 - /tags/stable-2_20_1/installation/
by jsrain＠svn2.opensuse.org 18 Nov '10

18 Nov '10

Author: jsrain Date: Thu Nov 18 16:17:06 2010 New Revision: 62869 URL: http://svn.opensuse.org/viewcvs/yast?rev=62869&view=rev Log: Created tag stable-2_20_1 for installation Added: tags/stable-2_20_1/installation/ - copied from r62868, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62868 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_prepareprogress.ycp src/modules/ImageInstallation.ycp
by jsrain＠svn2.opensuse.org 18 Nov '10

18 Nov '10

Author: jsrain Date: Thu Nov 18 16:16:55 2010 New Revision: 62868 URL: http://svn.opensuse.org/viewcvs/yast?rev=62868&view=rev Log: use df for estimating partition size for live installer (bnc#555288) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_prepareprogress.ycp trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=62868&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Nov 18 16:16:55 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Nov 18 16:16:55 2010 @@ -1,8 +1,11 @@ ------------------------------------------------------------------- -Thu Nov 18 11:33:48 UTC 2010 - jsrain(a)suse.cz +Thu Nov 16 16:13:48 UTC 2010 - jsrain(a)suse.cz - fixed behavior of window closing in installation proposal (bnc#636980) +- use df for estimating partition size for live installer + (bnc#555288) +- 2.20.1 ------------------------------------------------------------------- Thu Sep 30 17:33:48 UTC 2010 - lslezak(a)suse.cz Modified: trunk/installation/src/clients/inst_prepareprogress.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pr… ============================================================================== --- trunk/installation/src/clients/inst_prepareprogress.ycp (original) +++ trunk/installation/src/clients/inst_prepareprogress.ycp Thu Nov 18 16:16:55 2010 @@ -36,12 +36,25 @@ integer live_size = 0; if (Mode::live_installation()) { + + string cmd = sformat ("df -P -k %1", "/"); + y2milestone ("Executing %1", cmd); + map out = (map)SCR::Execute (.target.bash_output, cmd); + y2milestone ("Output: %1", out); + string total_str = out["stdout"]:""; + total_str = splitstring(total_str, "\n")[1]:""; + live_size = tointeger (filter (string s, splitstring (total_str, " "), {return s != "";})[2]:"0"); + +/* Using df-based progress estimation, is rather faster + may be less precise + see bnc#555288 string cmd = sformat ("du -x -B 1024 -s %1", "/"); y2milestone ("Executing %1", cmd); map out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Output: %1", out); string total_str = out["stdout"]:""; live_size = tointeger (total_str); +*/ if (live_size == 0) live_size = 1024*1024; // 1 GB is a good approximation } Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Thu Nov 18 16:16:55 2010 @@ -892,12 +892,24 @@ integer progress_start, integer progress_finish) { + string cmd = sformat ("df -P -k %1", from); + y2milestone ("Executing %1", cmd); + map out = (map)SCR::Execute (.target.bash_output, cmd); + y2milestone ("Output: %1", out); + string total_str = out["stdout"]:""; + total_str = splitstring(total_str, "\n")[1]:""; + integer total_mb = tointeger (filter (string s, splitstring (total_str, " "), {return s != "";})[2]:"0"); + +/* Using df-based progress estimation, is rather faster + may be less precise + see bnc#555288 string cmd = sformat ("du -x -B 1048576 -s %1", from); y2milestone ("Executing %1", cmd); map out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Output: %1", out); string total_str = out["stdout"]:""; integer total_mb = tointeger (total_str); +*/ if (total_mb == 0) total_mb = 1024*1024*1024; // should be big enough -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62867 - in /trunk/live-installer: package/yast2-live-installer.changes src/live-installer.ycp
by jsrain＠svn2.opensuse.org 18 Nov '10

18 Nov '10

Author: jsrain Date: Thu Nov 18 13:07:53 2010 New Revision: 62867 URL: http://svn.opensuse.org/viewcvs/yast?rev=62867&view=rev Log: suppress memory warning if live installer is running directly from boot scripts (bnc#547743) Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/live-installer.ycp Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Thu Nov 18 13:07:53 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 18 13:12:37 UTC 2010 - jsrain(a)suse.cz + +- suppress memory warning if live installer is running directly + from boot scripts (bnc#547743) + +------------------------------------------------------------------- Tue Oct 12 13:32:37 UTC 2010 - lslezak(a)suse.cz - don't use obsoleted inst_packages.ycp client, use PackagesUI.ycp Modified: trunk/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installe… ============================================================================== --- trunk/live-installer/src/live-installer.ycp (original) +++ trunk/live-installer/src/live-installer.ycp Thu Nov 18 13:07:53 2010 @@ -35,7 +35,11 @@ integer memsize = memories[0,"resource","phys_mem",0,"range"]:0; integer oneGB = 1073741824; y2milestone ("Physical memory %1", memsize); - if (memsize < oneGB) { + + string cmd = "cat /proc/cmdline | grep -q liveinstall"; + boolean live_only = (0 == (integer)SCR::Execute (.target.bash, cmd)); + + if (memsize < oneGB && ! live_only) { // pop-up, %1 is memory size, currently hardcoded "1 GB" if (! Popup::ContinueCancel (sformat (_("Your computer has less than %1 of memory. This may not be sufficient for the live installation, especially when installing @@ -72,7 +76,7 @@ // detect removable media, if they are mounted, they cannot be used for installation (bnc #437235) // this is a hack, since partitioner cannot provide information which partitions will be resized, // removed or formatted and thus mustn't be mounted during installation - string cmd = "cat /proc/mounts |grep '\/media\/'"; + cmd = "cat /proc/mounts |grep '\/media\/'"; if (0 == (integer)SCR::Execute (.target.bash, cmd)) { // continue/cancel pop-up -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62866 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_proposal.ycp
by jsrain＠svn2.opensuse.org 18 Nov '10

18 Nov '10

Author: jsrain Date: Thu Nov 18 11:42:59 2010 New Revision: 62866 URL: http://svn.opensuse.org/viewcvs/yast?rev=62866&view=rev Log: fixed behavior of window closing in installation proposal (bnc#636980) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_proposal.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Nov 18 11:42:59 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 18 11:33:48 UTC 2010 - jsrain(a)suse.cz + +- fixed behavior of window closing in installation proposal + (bnc#636980) + +------------------------------------------------------------------- Thu Sep 30 17:33:48 UTC 2010 - lslezak(a)suse.cz - don't use spaces in repo alias (bnc#596950) Modified: trunk/installation/src/clients/inst_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pr… ============================================================================== --- trunk/installation/src/clients/inst_proposal.ycp (original) +++ trunk/installation/src/clients/inst_proposal.ycp Thu Nov 18 11:42:59 2010 @@ -1167,7 +1167,11 @@ // Some proposal module can change it while called SetNextButton(); - input = Wizard::UserInput(); + input = UI::UserInput(); + + if ( input == `accept ) return `next; + if ( input == `cancel ) return `abort; + y2milestone("Proposal - UserInput: '%1'", input); richtext_busy_cursor(`id(`proposal ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62865 - in /branches/SuSE-Code-11-SP2-Branch/theme: SLE/wizard/installation.qss openSUSE/wizard/installation.qss package/yast2-theme.changes
by jsrain＠svn2.opensuse.org 18 Nov '10

18 Nov '10

Author: jsrain Date: Thu Nov 18 10:42:47 2010 New Revision: 62865 URL: http://svn.opensuse.org/viewcvs/yast?rev=62865&view=rev Log: address the button submenu styling. bnc#444400 and bnc#458001 Modified: branches/SuSE-Code-11-SP2-Branch/theme/SLE/wizard/installation.qss branches/SuSE-Code-11-SP2-Branch/theme/openSUSE/wizard/installation.qss branches/SuSE-Code-11-SP2-Branch/theme/package/yast2-theme.changes Modified: branches/SuSE-Code-11-SP2-Branch/theme/SLE/wizard/installation.qss URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/theme… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/theme/SLE/wizard/installation.qss (original) +++ branches/SuSE-Code-11-SP2-Branch/theme/SLE/wizard/installation.qss Thu Nov 18 10:42:47 2010 @@ -123,22 +123,9 @@ border-radius: 3px; } -QMenu::item:selected { - background-color: white; - color: black; -} - -.ymenubutton { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #a5a5a5, stop: 0.8 #4d4d4d, stop: 1 #545454); -} YQProgressBar > YQWidgetCaption { margin-top: 20px; } -QPushButton::menu-indicator { - subcontrol-origin: margin; - left: -7px; - subcontrol-position: right; -} /* YQMultiProgressMeter::chunk { @@ -340,10 +327,13 @@ } /* odd dropdown button widget */ - #work_area QPushButton::menu-indicator { + #work_area QPushButton::menu-indicator, + #work_area QPushButton::menu-indicator:pressed, + QPushButton::menu-indicator:open { subcontrol-origin: margin; left: -7px; subcontrol-position: right; + image: url(arr_down.png); } #work_area QPushButton:open { /* when the button has its menu open */ @@ -352,18 +342,20 @@ border: 1px solid #dddddd; } - #work_area QPushButton::menu-indicator { - image: url(arr_down.png); - /* - subcontrol-origin: padding; - subcontrol-position: bottom right; - */ - } + /* button menus */ + QPushButton QMenu { + border: 1px solid #888; + + } + QPushButton QMenu::item { + background-color: #bebebe; + color: black; + } - #work_area QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open { - position: relative; - top: 1px; left: 1px; /* shift the arrow by 1 px */ - } + QPushButton QMenu::item:selected { + background-color: #4d8e0d; + color: white; + } Modified: branches/SuSE-Code-11-SP2-Branch/theme/openSUSE/wizard/installation.qss URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/theme… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/theme/openSUSE/wizard/installation.qss (original) +++ branches/SuSE-Code-11-SP2-Branch/theme/openSUSE/wizard/installation.qss Thu Nov 18 10:42:47 2010 @@ -125,14 +125,7 @@ border-radius: 3px; } -QMenu::item:selected { - background-color: white; - color: black; -} -.ymenubutton { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #a5a5a5, stop: 0.8 #4d4d4d, stop: 1 #545454); -} YQProgressBar > YQWidgetCaption { margin-top: 20px; } @@ -333,6 +326,20 @@ } + /* button menus */ + QPushButton QMenu { + border: 1px solid #888; + + } + QPushButton QMenu::item { + background-color: #bebebe; + color: black; + } + + QPushButton QMenu::item:selected { + background-color: #4d8e0d; + color: white; + } #work_area QProgressBar { border: 1px solid #444; Modified: branches/SuSE-Code-11-SP2-Branch/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/theme… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/theme/package/yast2-theme.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/theme/package/yast2-theme.changes Thu Nov 18 10:42:47 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Nov 18 10:39:14 CET 2010 - jsrain(a)novell.com + +- address the button submenu styling. bnc#444400 and bnc#458001. + +------------------------------------------------------------------- Fri Mar 12 10:08:16 CET 2010 - jsrain(a)suse.cz - added openvas module icons also for SLE (bnc#587800) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62864 - /branches/SuSE-Code-11-SP2-Branch/theme/
by jsrain＠svn2.opensuse.org 18 Nov '10

18 Nov '10

Author: jsrain Date: Thu Nov 18 10:39:05 2010 New Revision: 62864 URL: http://svn.opensuse.org/viewcvs/yast?rev=62864&view=rev Log: branching for SP2 fixes Added: branches/SuSE-Code-11-SP2-Branch/theme/ (props changed) - copied from r62863, branches/SuSE-Code-11-SP1-Branch/theme/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62863 - in /trunk/ftp-server: package/yast2-ftp-server.changes src/wid_functions.ycp src/write_load.ycp
by jsrain＠svn2.opensuse.org 18 Nov '10

18 Nov '10

Author: jsrain Date: Thu Nov 18 09:28:36 2010 New Revision: 62863 URL: http://svn.opensuse.org/viewcvs/yast?rev=62863&view=rev Log: remove listen_ipv6 from vsftp.conf - it was preventing from running in standalone mode (bnc#632543) Modified: trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/wid_functions.ycp trunk/ftp-server/src/write_load.ycp Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-ser… ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Thu Nov 18 09:28:36 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 18 09:30:14 CEST 2010 - jsrain(a)suse.cz + +- remove listen_ipv6 from vsftp.conf - it was preventing from + running in standalone mode (bnc#632543) + +------------------------------------------------------------------- Fri Apr 23 16:30:14 CEST 2010 - juhliarik(a)suse.cz - added fix for parsing options from xinetd (bnc#597842) Modified: trunk/ftp-server/src/wid_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/wid_functions.ycp… ============================================================================== --- trunk/ftp-server/src/wid_functions.ycp (original) +++ trunk/ftp-server/src/wid_functions.ycp Thu Nov 18 09:28:36 2010 @@ -159,6 +159,7 @@ if ((FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2") && (Service::Status("pure-ftpd") != 0)) { SCR::Write(add(.vsftpd, "listen"), nil); + SCR::Write(add(.vsftpd, "listen_ipv6"), nil); SCR::Write(.vsftpd, nil); FtpServer::stop_daemon_xinetd = false; result = AskStartXinetd (); @@ -180,6 +181,7 @@ } else { SCR::Write(add(.vsftpd, "listen"), "YES"); + SCR::Write(add(.vsftpd, "listen_ipv6"), nil); SCR::Write(.vsftpd, nil); string command = "rcvsftpd start"; map options = (map)SCR::Execute (.target.bash_output, command); @@ -1434,4 +1436,4 @@ } } -} \ No newline at end of file +} Modified: trunk/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/write_load.ycp?re… ============================================================================== --- trunk/ftp-server/src/write_load.ycp (original) +++ trunk/ftp-server/src/write_load.ycp Thu Nov 18 09:28:36 2010 @@ -1096,6 +1096,7 @@ Service::Disable("pure-ftpd"); if (FtpServer::vsftpd_edit) { FtpServer::VS_SETTINGS["listen"]=nil; + FtpServer::VS_SETTINGS["listen_ipv6"]=nil; } else { FtpServer::PURE_SETTINGS["Daemonize"]="NO"; } @@ -1112,6 +1113,7 @@ } if (FtpServer::vsftpd_edit) { FtpServer::VS_SETTINGS["listen"]="YES"; + FtpServer::VS_SETTINGS["listen_ipv6"]=nil; } else { FtpServer::PURE_SETTINGS["Daemonize"]="YES"; } @@ -1120,6 +1122,7 @@ Service::Disable("pure-ftpd"); if (FtpServer::vsftpd_edit) { FtpServer::VS_SETTINGS["listen"]="YES"; + FtpServer::VS_SETTINGS["listen_ipv6"]=nil; } else { FtpServer::PURE_SETTINGS["Daemonize"]="YES"; } @@ -1154,4 +1157,4 @@ } -} \ No newline at end of file +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62862 - /tags/stable-2_20_5/yast2/
by mzugec＠svn2.opensuse.org 16 Nov '10

16 Nov '10

Author: mzugec Date: Tue Nov 16 15:48:42 2010 New Revision: 62862 URL: http://svn.opensuse.org/viewcvs/yast?rev=62862&view=rev Log: Created tag stable-2_20_5 for yast2 Added: tags/stable-2_20_5/yast2/ (props changed) - copied from r62861, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62861 - in /trunk/yast2: VERSION library/log/src/LogView.ycp package/yast2.changes
by mzugec＠svn2.opensuse.org 16 Nov '10

16 Nov '10

Author: mzugec Date: Tue Nov 16 15:47:37 2010 New Revision: 62861 URL: http://svn.opensuse.org/viewcvs/yast?rev=62861&view=rev Log: save log file into home directory by default (bnc#653601) Modified: trunk/yast2/VERSION trunk/yast2/library/log/src/LogView.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=62861&r1=62860… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Nov 16 15:47:37 2010 @@ -1 +1 @@ -2.20.4 +2.20.5 Modified: trunk/yast2/library/log/src/LogView.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/log/src/LogView.yc… ============================================================================== --- trunk/yast2/library/log/src/LogView.ycp (original) +++ trunk/yast2/library/log/src/LogView.ycp Tue Nov 16 15:47:37 2010 @@ -395,8 +395,8 @@ if (ret == `_cwm_log_save) { string filename = UI::AskForSaveFileName( - // popup caption - "/tmp", "*.log", _("Save Log as...")); + // popup caption, save into home directory by default (bnc#653601) + "~", "*.log", _("Save Log as...")); if (filename != nil) { SCR::Write (.target.string, filename, Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Nov 16 15:47:37 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 16 15:45:30 CET 2010 - mzugec(a)suse.cz + +- save log file into home directory by default (bnc#653601) +- 2.20.5 + +------------------------------------------------------------------- Fri Nov 12 15:42:50 CET 2010 - mzugec(a)suse.cz - FileChanges: fixed testsuite -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62860 - /tags/stable-2_20_4/network/
by mzugec＠svn2.opensuse.org 16 Nov '10

16 Nov '10

Author: mzugec Date: Tue Nov 16 11:14:20 2010 New Revision: 62860 URL: http://svn.opensuse.org/viewcvs/yast?rev=62860&view=rev Log: Created tag stable-2_20_4 for network Added: tags/stable-2_20_4/network/ - copied from r62859, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62859 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp
by mzugec＠svn2.opensuse.org 16 Nov '10

16 Nov '10

Author: mzugec Date: Tue Nov 16 11:14:11 2010 New Revision: 62859 URL: http://svn.opensuse.org/viewcvs/yast?rev=62859&view=rev Log: accept unconfigured + BOOTPROTO=none bondslaves (bnc#652987) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62859&r1=628… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Nov 16 11:14:11 2010 @@ -1 +1 @@ -2.20.3 +2.20.4 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Nov 16 11:14:11 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 16 11:13:12 CET 2010 - mzugec(a)suse.cz + +- accept unconfigured + BOOTPROTO=none bondslaves (bnc#652987) +- 2.20.4 + +------------------------------------------------------------------- Mon Nov 15 12:37:29 CET 2010 - mzugec(a)suse.cz - correctly apply BusID based udev rules in AY (bnc#648270) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Tue Nov 16 11:14:11 2010 @@ -196,8 +196,9 @@ map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { - //filter the eth devices (BOOT_PROTO=none && START_MODE=off) - if (((string)configurations[devtype, devname, "BOOTPROTO"]:"" == "none") && ((string)configurations[devtype, devname, "STARTMODE"]:"" == "off")) + //filter the eth devices (BOOT_PROTO=none + // don't care about STARTMODE (see bnc#652987c6) + if (((string)configurations[devtype, devname, "BOOTPROTO"]:"" == "none")/* && ((string)configurations[devtype, devname, "STARTMODE"]:"" == "off")*/) items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), contains(settings["SLAVES"]:[], devname)) ); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62858 - /tags/branch-Code-11-SP1-2_17_146/network/
by mzugec＠svn2.opensuse.org 16 Nov '10

16 Nov '10

Author: mzugec Date: Tue Nov 16 11:12:23 2010 New Revision: 62858 URL: http://svn.opensuse.org/viewcvs/yast?rev=62858&view=rev Log: Created tag branch-Code-11-SP1-2_17_146 for network Added: tags/branch-Code-11-SP1-2_17_146/network/ (props changed) - copied from r62857, branches/SuSE-Code-11-SP1-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62857 - /tags/branch-Code-11-SP1-2_17_146/
by mzugec＠svn2.opensuse.org 16 Nov '10

16 Nov '10

Author: mzugec Date: Tue Nov 16 11:12:21 2010 New Revision: 62857 URL: http://svn.opensuse.org/viewcvs/yast?rev=62857&view=rev Log: Created tag branch-Code-11-SP1-2_17_146 Added: tags/branch-Code-11-SP1-2_17_146/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62856 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/lan/address.ycp
by mzugec＠svn2.opensuse.org 16 Nov '10

16 Nov '10

Author: mzugec Date: Tue Nov 16 11:12:12 2010 New Revision: 62856 URL: http://svn.opensuse.org/viewcvs/yast?rev=62856&view=rev Log: L3: accept unconfigured+BOOTPROTO=none bondslaves (bnc#652987) 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/lan/address.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Tue Nov 16 11:12:12 2010 @@ -1 +1 @@ -2.17.145 +2.17.146 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/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Tue Nov 16 11:12:12 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 16 11:07:19 CET 2010 - mzugec(a)suse.cz + +- L3: accept unconfigured+BOOTPROTO=none bondslaves (bnc#652987) +- 2.17.146 + +------------------------------------------------------------------- Mon Nov 15 12:31:45 CET 2010 - mzugec(a)suse.cz - correctly apply BusID based udev rules in AY (bnc#648270) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp Tue Nov 16 11:12:12 2010 @@ -163,8 +163,9 @@ map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { - //filter the eth devices (BOOT_PROTO=none && START_MODE=off) - if (((string)configurations[devtype, devname, "BOOTPROTO"]:"" == "none") && ((string)configurations[devtype, devname, "STARTMODE"]:"" == "off")) + //filter the eth devices (BOOT_PROTO=none + // don't care about STARTMODE (see bnc#652987c6) + if (((string)configurations[devtype, devname, "BOOTPROTO"]:"" == "none")/* && ((string)configurations[devtype, devname, "STARTMODE"]:"" == "off")*/) items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), contains(settings["SLAVES"]:[], devname)) ); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62855 - /tags/stable-2_20_3/network/
by mzugec＠svn2.opensuse.org 15 Nov '10

15 Nov '10

Author: mzugec Date: Mon Nov 15 12:39:00 2010 New Revision: 62855 URL: http://svn.opensuse.org/viewcvs/yast?rev=62855&view=rev Log: Created tag stable-2_20_3 for network Added: tags/stable-2_20_3/network/ - copied from r62854, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62854 - in /trunk/network: VERSION package/yast2-network.changes src/modules/LanUdevAuto.ycp
by mzugec＠svn2.opensuse.org 15 Nov '10

15 Nov '10

Author: mzugec Date: Mon Nov 15 12:38:47 2010 New Revision: 62854 URL: http://svn.opensuse.org/viewcvs/yast?rev=62854&view=rev Log: correctly apply BusID based udev rules in AY (bnc#648270) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/LanUdevAuto.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62854&r1=628… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Nov 15 12:38:47 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Nov 15 12:38:47 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 15 12:37:29 CET 2010 - mzugec(a)suse.cz + +- correctly apply BusID based udev rules in AY (bnc#648270) +- 2.20.3 + +------------------------------------------------------------------- Mon Nov 8 15:28:20 CET 2010 - mzugec(a)suse.cz - TP-L3: if possible, for temporary installation network use same Modified: trunk/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanUdevAuto.… ============================================================================== --- trunk/network/src/modules/LanUdevAuto.ycp (original) +++ trunk/network/src/modules/LanUdevAuto.ycp Mon Nov 15 12:38:47 2010 @@ -237,7 +237,20 @@ y2milestone("MAC address matched with device:%1", rule["name"]:""); break; } - } + } else if (rule["rule"]:""=="KERNELS"){ + y2milestone("rule: %1", rule); + /* input parameter is MAC address, output is BusID of matched device */ + map cmd = (map)SCR::Execute(.target.bash_output, + sformat( "DEVICE=$(grep '%1' /sys/class/net/*/address);KERNELS=$(ls -l \"$(echo ${DEVICE%%/*})/device\");echo ${KERNELS##*/}|tr -d '\n'", mac)); + if (cmd["exit"]:-1==0){ + y2milestone("cmd output:%1", cmd["stdout"]:""); + if (cmd["stdout"]:""==rule["value"]:""){ + y2internal("match!"); + devname=rule["name"]:""; + } + } + } else + y2error("Unknown rule for:%1", rule); }); } else y2warning("No MAC address to compare."); return devname; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62853 - /tags/branch-Code-11-SP1-2_17_145/network/
by mzugec＠svn2.opensuse.org 15 Nov '10

15 Nov '10

Author: mzugec Date: Mon Nov 15 12:36:34 2010 New Revision: 62853 URL: http://svn.opensuse.org/viewcvs/yast?rev=62853&view=rev Log: Created tag branch-Code-11-SP1-2_17_145 for network Added: tags/branch-Code-11-SP1-2_17_145/network/ (props changed) - copied from r62852, branches/SuSE-Code-11-SP1-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62852 - /tags/branch-Code-11-SP1-2_17_145/
by mzugec＠svn2.opensuse.org 15 Nov '10

15 Nov '10

Author: mzugec Date: Mon Nov 15 12:36:32 2010 New Revision: 62852 URL: http://svn.opensuse.org/viewcvs/yast?rev=62852&view=rev Log: Created tag branch-Code-11-SP1-2_17_145 Added: tags/branch-Code-11-SP1-2_17_145/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62851 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/modules/LanUdevAuto.ycp
by mzugec＠svn2.opensuse.org 15 Nov '10

15 Nov '10

Author: mzugec Date: Mon Nov 15 12:36:25 2010 New Revision: 62851 URL: http://svn.opensuse.org/viewcvs/yast?rev=62851&view=rev Log: correctly apply BusID based udev rules in AY (bnc#648270) 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/LanUdevAuto.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Mon Nov 15 12:36:25 2010 @@ -1 +1 @@ -2.17.144 +2.17.145 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/netwo… ============================================================================== --- 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 15 12:36:25 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 15 12:31:45 CET 2010 - mzugec(a)suse.cz + +- correctly apply BusID based udev rules in AY (bnc#648270) +- 2.17.145 + +------------------------------------------------------------------- Mon Nov 8 16:40:34 CET 2010 - mzugec(a)suse.de - TP-L3: if possible, for temporary installation network use same Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp Mon Nov 15 12:36:25 2010 @@ -237,7 +237,19 @@ y2milestone("MAC address matched with device:%1", rule["name"]:""); break; } - } + } else if (rule["rule"]:""=="KERNELS"){ + y2milestone("rule: %1", rule); + map cmd = (map)SCR::Execute(.target.bash_output, + sformat( "DEVICE=$(grep '%1' /sys/class/net/*/address);KERNELS=$(ls -l \"$(echo ${DEVICE%%/*})/device\");echo ${KERNELS##*/}|tr -d '\n'", mac)); + if (cmd["exit"]:-1==0){ + y2milestone("cmd output:%1", cmd["stdout"]:""); + if (cmd["stdout"]:""==rule["value"]:""){ + y2internal("match!"); + devname=rule["name"]:""; + } + } + } else + y2error("Unknown rule for:%1", rule); }); } else y2warning("No MAC address to compare."); return devname; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62850 - /tags/branch-SLE-10-SP4-2_13_192/packager/
by lslezak＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: lslezak Date: Fri Nov 12 16:43:51 2010 New Revision: 62850 URL: http://svn.opensuse.org/viewcvs/yast?rev=62850&view=rev Log: Created tag branch-SLE-10-SP4-2_13_192 for packager Added: tags/branch-SLE-10-SP4-2_13_192/packager/ (props changed) - copied from r62849, branches/SuSE-SLE-10-SP4-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62849 - /tags/branch-SLE-10-SP4-2_13_192/
by lslezak＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: lslezak Date: Fri Nov 12 16:43:49 2010 New Revision: 62849 URL: http://svn.opensuse.org/viewcvs/yast?rev=62849&view=rev Log: Created tag branch-SLE-10-SP4-2_13_192 Added: tags/branch-SLE-10-SP4-2_13_192/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62848 - in /branches/SuSE-SLE-10-SP4-Branch/packager: VERSION package/yast2-packager.changes src/modules/SourceDialogs.ycp
by lslezak＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: lslezak Date: Fri Nov 12 16:43:43 2010 New Revision: 62848 URL: http://svn.opensuse.org/viewcvs/yast?rev=62848&view=rev Log: - source manager - changed "Local Directory" radio button label to "Local Directory or ISO" as it's also possible to add an ISO image there (bnc#471203) - 2.13.192 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/SourceDialogs.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Fri Nov 12 16:43:43 2010 @@ -1 +1 @@ -2.13.191 +2.13.192 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes Fri Nov 12 16:43:43 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 12 15:30:17 UTC 2010 - lslezak(a)suse.cz + +- source manager - changed "Local Directory" radio button label + to "Local Directory or ISO" as it's also possible to add an ISO + image there (bnc#471203) +- 2.13.192 + +------------------------------------------------------------------- Thu Nov 11 09:48:40 CET 2010 - jsrain(a)suse.cz - renamed the HyperV drivers (bnc#652294) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/SourceDialogs.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/SourceDialogs.ycp Fri Nov 12 16:43:43 2010 @@ -815,7 +815,7 @@ // radio button `Left (`RadioButton(`id(`dvd), _("&DVD..."))), // radio button - `Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))), + `Left (`RadioButton(`id(`local_dir), _("Local Directory or ISO") + "...")), // radio button `Left (`RadioButton(`id(`pkg), _("&Package Directory..."))), // TODO: Proposal: move the functionality to "Local Directory", move ISO here // radio button @@ -834,7 +834,7 @@ // radio button `Left (`RadioButton(`id(`dvd), _("&DVD..."))), // radio button - `Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))), + `Left (`RadioButton(`id(`local_dir), _("Local Directory or ISO") + "...")), // radio button `Left (`RadioButton(`id(`pkg), _("&Package Directory..."))), // radio button -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62847 - in /trunk/yast2: library/system/testsuite/tests/filechanges.ycp package/yast2.changes
by mzugec＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: mzugec Date: Fri Nov 12 15:43:39 2010 New Revision: 62847 URL: http://svn.opensuse.org/viewcvs/yast?rev=62847&view=rev Log: FileChanges: fixed testsuite Modified: trunk/yast2/library/system/testsuite/tests/filechanges.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/system/testsuite/tests/filechanges.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/testsuite/t… ============================================================================== --- trunk/yast2/library/system/testsuite/tests/filechanges.ycp (original) +++ trunk/yast2/library/system/testsuite/tests/filechanges.ycp Fri Nov 12 15:43:39 2010 @@ -34,17 +34,19 @@ list EXECL = [ $[ "target" : $[ "bash_output" : $[ - "exit" : "0", + "exit" : 0, "stdout" : "ntp.rpm", + "stderr" : "" ], ], ], $[ "target" : $[ "bash_output" : $[ - "exit" : "0", + "exit" : 0, "stdout" : "S.?....T /etc/ntp.conf ..?..... c /var/lib/ntp/etc/ntp.conf.iburst", + "stderr" : "" ], ], ], Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Nov 12 15:43:39 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 12 15:42:50 CET 2010 - mzugec(a)suse.cz + +- FileChanges: fixed testsuite + +------------------------------------------------------------------- Fri Nov 12 11:03:58 CET 2010 - mzugec(a)suse.cz - yast2 added bind-utils dependency (bnc#651893) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62846 - /tags/stable-2_20_12/packager/
by lslezak＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: lslezak Date: Fri Nov 12 15:09:53 2010 New Revision: 62846 URL: http://svn.opensuse.org/viewcvs/yast?rev=62846&view=rev Log: Created tag stable-2_20_12 for packager Added: tags/stable-2_20_12/packager/ - copied from r62845, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62845 - /tags/stable-2_20_12/
by lslezak＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: lslezak Date: Fri Nov 12 15:09:51 2010 New Revision: 62845 URL: http://svn.opensuse.org/viewcvs/yast?rev=62845&view=rev Log: Created tag stable-2_20_12 Added: tags/stable-2_20_12/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62844 - in /trunk/packager: VERSION package/yast2-packager.changes
by lslezak＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: lslezak Date: Fri Nov 12 15:07:35 2010 New Revision: 62844 URL: http://svn.opensuse.org/viewcvs/yast?rev=62844&view=rev Log: - 2.20.12 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62844&r1=62… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Nov 12 15:07:35 2010 @@ -1 +1 @@ -2.20.11 +2.20.12 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Nov 12 15:07:35 2010 @@ -3,6 +3,7 @@ - display more details when adding a community repository fails (bnc#440332) +- 2.20.12 ------------------------------------------------------------------- Thu Nov 11 17:14:29 UTC 2010 - lslezak(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62843 - in /trunk/packager: package/yast2-packager.changes src/clients/inst_productsources.ycp
by lslezak＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: lslezak Date: Fri Nov 12 12:39:25 2010 New Revision: 62843 URL: http://svn.opensuse.org/viewcvs/yast?rev=62843&view=rev Log: - display more details when adding a community repository fails (bnc#440332) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_productsources.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Nov 12 12:39:25 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 12 11:37:16 UTC 2010 - lslezak(a)suse.cz + +- display more details when adding a community repository fails + (bnc#440332) + +------------------------------------------------------------------- Thu Nov 11 17:14:29 UTC 2010 - lslezak(a)suse.cz - fixed error handling for failed mounts, do not display negative Modified: trunk/packager/src/clients/inst_productsources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_produc… ============================================================================== --- trunk/packager/src/clients/inst_productsources.ycp (original) +++ trunk/packager/src/clients/inst_productsources.ycp Fri Nov 12 12:39:25 2010 @@ -550,7 +550,7 @@ }); // just for debugging purposes - y2debug ("%1", list_of_repos); + y2debug("list_of_repos: %1", list_of_repos); return true; } @@ -1288,12 +1288,32 @@ } if (src_id == nil) { + string error = ""; + string details = ""; + + if (repo_type == nil) + { + error = Pkg::LastError(); + if (size(error) > 0) + { + error = "\n\n" + error; + } + + details = Pkg::LastErrorDetails(); + if (size(details) > 0) + { + details = "\n\n" + details; + } + } + Report::Error (sformat ( // TRANSLATORS: pop-up error message // %1 is replaced with a repository name or URL _("Adding repository %1 failed"), (repo_name != "" ? repo_name : url) - )); + ) + + error + details + ); // FIXME: retry ? return false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62842 - /tags/stable-2_20_4/yast2/
by mzugec＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: mzugec Date: Fri Nov 12 11:05:56 2010 New Revision: 62842 URL: http://svn.opensuse.org/viewcvs/yast?rev=62842&view=rev Log: Created tag stable-2_20_4 for yast2 Added: tags/stable-2_20_4/yast2/ (props changed) - copied from r62841, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62841 - in /trunk/yast2: VERSION package/yast2.changes yast2.spec.in
by mzugec＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: mzugec Date: Fri Nov 12 11:05:37 2010 New Revision: 62841 URL: http://svn.opensuse.org/viewcvs/yast?rev=62841&view=rev Log: yast2 added bind-utils dependency (bnc#651893) Modified: trunk/yast2/VERSION trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=62841&r1=62840… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Nov 12 11:05:37 2010 @@ -1 +1 @@ -2.20.3 +2.20.4 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Nov 12 11:05:37 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 12 11:03:58 CET 2010 - mzugec(a)suse.cz + +- yast2 added bind-utils dependency (bnc#651893) +- 2.20.4 + +------------------------------------------------------------------- Fri Nov 12 10:23:17 CET 2010 - mzugec(a)suse.cz - FileChanges: test rpm command exit value Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=62841&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Fri Nov 12 11:05:37 2010 @@ -33,6 +33,8 @@ Requires: perl-XML-Simple # for GPG.ycp Requires: gpg2 +# for Punycode.ycp (bnc#651893) +Requires: bind-utils # xdg-su in .desktops Recommends: xdg-utils -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62840 - in /trunk/yast2: library/system/src/FileChanges.ycp package/yast2.changes
by mzugec＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: mzugec Date: Fri Nov 12 10:45:30 2010 New Revision: 62840 URL: http://svn.opensuse.org/viewcvs/yast?rev=62840&view=rev Log: FileChanges: test rpm command exit value Modified: trunk/yast2/library/system/src/FileChanges.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/system/src/FileChanges.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/FileCha… ============================================================================== --- trunk/yast2/library/system/src/FileChanges.ycp (original) +++ trunk/yast2/library/system/src/FileChanges.ycp Fri Nov 12 10:45:30 2010 @@ -87,7 +87,7 @@ map out = (map)SCR::Execute (.target.bash_output, cmd); string package = out["stdout"]:""; y2milestone ("Package owning %1: %2", file, package); - if (package == "") + if (package == "" || out["exit"]:-1 != 0) return false; cmd = sformat ("rpm -V %1 |grep ' %2$'", package, file); out = (map)SCR::Execute (.target.bash_output, cmd); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Nov 12 10:45:30 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 12 10:23:17 CET 2010 - mzugec(a)suse.cz + +- FileChanges: test rpm command exit value + +------------------------------------------------------------------- Fri Nov 5 12:40:03 UTC 2010 - lslezak(a)suse.cz - PackageCallbacks: removed the retry/abort/skip dialog from -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62839 - /tags/stable-2_20_1/ntp-client/
by varkoly＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: varkoly Date: Fri Nov 12 07:56:34 2010 New Revision: 62839 URL: http://svn.opensuse.org/viewcvs/yast?rev=62839&view=rev Log: Created tag stable-2_20_1 for ntp-client Added: tags/stable-2_20_1/ntp-client/ (props changed) - copied from r62838, trunk/ntp-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62838 - /trunk/ntp-client/VERSION
by varkoly＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: varkoly Date: Fri Nov 12 07:55:50 2010 New Revision: 62838 URL: http://svn.opensuse.org/viewcvs/yast?rev=62838&view=rev Log: New version for maintenance Modified: trunk/ntp-client/VERSION Modified: trunk/ntp-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/VERSION?rev=62838&r1=… ============================================================================== --- trunk/ntp-client/VERSION (original) +++ trunk/ntp-client/VERSION Fri Nov 12 07:55:50 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62837 - /branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes
by varkoly＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: varkoly Date: Fri Nov 12 07:53:16 2010 New Revision: 62837 URL: http://svn.opensuse.org/viewcvs/yast?rev=62837&view=rev Log: Save changes Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ntp-cl… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes (original) +++ branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes Fri Nov 12 07:53:16 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 12 08:38:53 CEST 2010 - varkoly(a)novell.com + +- bnc#650879 - Missing newline makes /etc/cron.d/novell.ntp-synchronize not work + +------------------------------------------------------------------- Wed Nov 10 15:11:04 CEST 2010 - varkoly(a)novell.com - bnc#619782 Time zone configuration during initial installation. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62836 - /trunk/ntp-client/package/yast2-ntp-client.changes
by varkoly＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: varkoly Date: Fri Nov 12 07:52:54 2010 New Revision: 62836 URL: http://svn.opensuse.org/viewcvs/yast?rev=62836&view=rev Log: Save changes Modified: trunk/ntp-client/package/yast2-ntp-client.changes Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli… ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Fri Nov 12 07:52:54 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 12 08:38:53 CEST 2010 - varkoly(a)novell.com + +- bnc#650879 - Missing newline makes /etc/cron.d/novell.ntp-synchronize not work + +------------------------------------------------------------------- Wed Nov 10 15:11:04 CEST 2010 - varkoly(a)novell.com - bnc#619782 Time zone configuration during initial installation. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62835 - /branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp
by varkoly＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: varkoly Date: Fri Nov 12 07:35:00 2010 New Revision: 62835 URL: http://svn.opensuse.org/viewcvs/yast?rev=62835&view=rev Log: bnc#650879 - Missing newline makes /etc/cron.d/novell.ntp-synchronize not work Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ntp-cl… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp Fri Nov 12 07:35:00 2010 @@ -846,7 +846,7 @@ } if (synchronize_time) { - SCR::Write (.target.string,cron_file,"-*/"+sync_interval+" * * * * root /etc/init.d/ntp ntptimeset &>/dev/null"); + SCR::Write (.target.string,cron_file,"-*/"+sync_interval+" * * * * root /etc/init.d/ntp ntptimeset &>/dev/null\n"); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62834 - /trunk/ntp-client/src/NtpClient.ycp
by varkoly＠svn2.opensuse.org 12 Nov '10

12 Nov '10

Author: varkoly Date: Fri Nov 12 07:34:02 2010 New Revision: 62834 URL: http://svn.opensuse.org/viewcvs/yast?rev=62834&view=rev Log: bnc#650879 - Missing newline makes /etc/cron.d/novell.ntp-synchronize not work Modified: trunk/ntp-client/src/NtpClient.ycp Modified: trunk/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/NtpClient.ycp?rev… ============================================================================== --- trunk/ntp-client/src/NtpClient.ycp (original) +++ trunk/ntp-client/src/NtpClient.ycp Fri Nov 12 07:34:02 2010 @@ -846,7 +846,7 @@ } if (synchronize_time) { - SCR::Write (.target.string,cron_file,"-*/"+sync_interval+" * * * * root /etc/init.d/ntp ntptimeset &>/dev/null"); + SCR::Write (.target.string,cron_file,"-*/"+sync_interval+" * * * * root /etc/init.d/ntp ntptimeset &>/dev/null\n"); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62833 - in /branches/SuSE-Code-11-SP1-Branch/vm: VERSION package/yast2-vm.changes src/vm_finish.ycp
by charlesa＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: charlesa Date: Thu Nov 11 19:38:12 2010 New Revision: 62833 URL: http://svn.opensuse.org/viewcvs/yast?rev=62833&view=rev Log: bnc#628256 - sysvinit: Id "x0" respawning too fast Modified: branches/SuSE-Code-11-SP1-Branch/vm/VERSION branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes branches/SuSE-Code-11-SP1-Branch/vm/src/vm_finish.ycp Modified: branches/SuSE-Code-11-SP1-Branch/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/VE… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/VERSION Thu Nov 11 19:38:12 2010 @@ -1 +1 @@ -2.16.9 +2.16.10 Modified: branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/pa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes Thu Nov 11 19:38:12 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 10 15:20:12 MST 2010 - carnold(a)novell.com + +- bnc#628256 - sysvinit: Id "x0" respawning too fast + +------------------------------------------------------------------- Wed Apr 1 09:18:46 MDT 2009 - carnold(a)novell.com - bnc#488598 - chkconfig and insserv fail on init scripts that Modified: branches/SuSE-Code-11-SP1-Branch/vm/src/vm_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/sr… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/src/vm_finish.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/src/vm_finish.ycp Thu Nov 11 19:38:12 2010 @@ -38,6 +38,7 @@ import "Arch"; import "Report"; +import "FileUtils"; any ret = nil; string func = ""; @@ -96,8 +97,15 @@ y2milestone("check for xvc0 in inittab and securetty"); if ( !contains(SCR::Dir(.etc.inittab), "x0") ) { + y2milestone("Adding the x0 entry in the inittab file"); SCR::Write (.etc.inittab.x0, sformat ("12345:respawn:/sbin/agetty -L 9600 xvc0 xterm")); SCR::Write (.etc.inittab, nil); + string dev_xvc0 = "/dev/xvc0"; + if ( ! FileUtils::Exists(dev_xvc0) ) + { + y2milestone("%1 not found, commenting out the x0 entry in the inittab", dev_xvc0); + SCR::Execute(.target.bash,"/bin/sed --in-place 's/^x0:/#x0:/g' /etc/inittab"); + } } SCR::Execute(.target.bash,"/usr/bin/grep -q xvc0 /etc/securetty || echo xvc0 >> /etc/securetty"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62832 - /tags/stable-2_20_11/packager/
by lslezak＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: lslezak Date: Thu Nov 11 18:39:26 2010 New Revision: 62832 URL: http://svn.opensuse.org/viewcvs/yast?rev=62832&view=rev Log: Created tag stable-2_20_11 for packager Added: tags/stable-2_20_11/packager/ - copied from r62831, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62831 - /tags/stable-2_20_11/
by lslezak＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: lslezak Date: Thu Nov 11 18:39:23 2010 New Revision: 62831 URL: http://svn.opensuse.org/viewcvs/yast?rev=62831&view=rev Log: Created tag stable-2_20_11 Added: tags/stable-2_20_11/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62830 - /trunk/packager/src/modules/Packages.ycp
by lslezak＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: lslezak Date: Thu Nov 11 18:36:32 2010 New Revision: 62830 URL: http://svn.opensuse.org/viewcvs/yast?rev=62830&view=rev Log: code cleanup - remove empty LockPackages() function Modified: trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Thu Nov 11 18:36:32 2010 @@ -1580,12 +1580,6 @@ } } -// lock some packages if needed -void LockPackages() -{ - // currently there is no need to lock any package... -} - /** * Initialize the repositories * @param show_popup boolean true to display information about initialization @@ -1645,8 +1639,6 @@ // FATE #302123 AddOnProduct::SetBaseProductURL (base_url); - LockPackages(); - init_in_progress = false; } @@ -1877,7 +1869,6 @@ Kernel::ProbeKernel(); Packages::Reset ([`product]); reinit = true; - LockPackages(); } boolean initial_run = reinit || ! init_called; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62829 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp src/modules/SpaceCalculation.ycp
by lslezak＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: lslezak Date: Thu Nov 11 18:35:05 2010 New Revision: 62829 URL: http://svn.opensuse.org/viewcvs/yast?rev=62829&view=rev Log: - fixed error handling for failed mounts, do not display negative disk space, allow installation in some cases (bnc#627969) - 2.20.11 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp trunk/packager/src/modules/SpaceCalculation.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62829&r1=62… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Nov 11 18:35:05 2010 @@ -1 +1 @@ -2.20.10 +2.20.11 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Nov 11 18:35:05 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 11 17:14:29 UTC 2010 - lslezak(a)suse.cz + +- fixed error handling for failed mounts, do not display negative + disk space, allow installation in some cases (bnc#627969) +- 2.20.11 + +------------------------------------------------------------------- Wed Nov 10 17:20:53 UTC 2010 - lslezak(a)suse.cz - update the number of the remaining packages when package Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Thu Nov 11 18:35:05 2010 @@ -465,6 +465,54 @@ ret["warning"] = ret["warning"]:"" + warning; } +// list of basic system directories, if any of them cannot be mounted +// the installation will be blocked +const list<string> basic_dirs = ["/", "/bin", "/boot", "/etc", "/lib", "/lib64", + "/opt", "/sbin", "/usr", "/var"]; + +map AddFailedMounts(map summary) +{ + list<map> failed_mounts = SpaceCalculation::GetFailedMounts(); + y2milestone("Failed mounts: %1: %2", size(failed_mounts), failed_mounts); + + foreach(map failed_mount, failed_mounts, + { + string delim = (size(summary["warning"]:"") > 0) ? " " : ""; + + if (contains(basic_dirs, failed_mount["mount"]:"")) + { + summary["warning"] = summary["warning"]:"" + delim + + // error message: %1: e.g. "/usr", %2: "/dev/sda2" + sformat(_("Error: Cannot check free space in basic directory %1 (device %2), cannot start installation."), + failed_mount["mount"]:"", + failed_mount["device"]:""); + + // we could not mount a basic directory, this indicates + // a severe problem in partition setup + summary["warning_level"] = `blocker; + } + else + { + summary["warning"] = summary["warning"]:"" + delim + + // error message: %1: e.g. "/local", %2: "/dev/sda2" + sformat(_("Warning: Cannot check free space in directory %1 (device %2)."), + failed_mount["mount"]:"", + failed_mount["device"]:""); + + // keep blocker, fatal and error level, they are higher than warning + if (!contains([`blocker, `fatal, `error], summary["warning_level"]:`ok)) + { + summary["warning_level"] = `warning; + } + } + } + ); + + y2milestone("Proposal summary: %1", summary); + + return summary; +} + /** * Print the installatino proposal summary * @param flags a list of symbols, see above @@ -528,6 +576,9 @@ } } + // add failed mounts + ret = AddFailedMounts(ret); + // FATE #304488 if (Mode::update()) CheckOldAddOns (ret); Modified: trunk/packager/src/modules/SpaceCalculation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SpaceCalcul… ============================================================================== --- trunk/packager/src/modules/SpaceCalculation.ycp (original) +++ trunk/packager/src/modules/SpaceCalculation.ycp Thu Nov 11 18:35:05 2010 @@ -28,6 +28,7 @@ boolean info_called = false; // list partition_info already initialized? list partition_info = []; // information about available partitions + list<map> failed_mounts = []; /* * Return partition info list @@ -37,6 +38,11 @@ return partition_info; } + global define list<map> GetFailedMounts() + { + return failed_mounts; + } + /** * Get mountpoint for a directory * @param target directory @@ -262,6 +268,9 @@ } // !Stage::initial () + // remove the previous failures + failed_mounts = []; + // installation stage - Storage:: is definitely present // call Storage::GetTargetMap() map<string, map> targets = (map<string, map>)WFM::call("wrapper_storage", ["GetTargetMap"]); @@ -286,6 +295,8 @@ foreach( map part, part_info, ``{ + y2milestone("Adding partition: %1", part); + symbol used_fs = part["used_fs"]:`unknown; // ignore VFAT and NTFS partitions (bnc#) @@ -337,22 +348,33 @@ y2milestone("Executing mount command: %1", mount_command); - SCR::Execute(.target.bash, mount_command); + integer result = (integer)SCR::Execute(.target.bash, mount_command); + y2milestone("Mount result: %1", result); - list<map<string,string> > partition = - (list<map<string, string> >) - SCR::Read(.run.df); - foreach (map p, partition, { - if (p["name"]:"" == tmpdir) - { - y2internal ("P: %1", p); - free_size = tointeger (p["free"]:"0") - * 1024; - used = tointeger (p["used"]:"0") * 1024; - } - }); - SCR::Execute (.target.bash, sformat ( - "/bin/umount %1", tmpdir)); + if (result == 0) + { + list<map<string,string> > partition = + (list<map<string, string> >) + SCR::Read(.run.df); + foreach (map p, partition, { + if (p["name"]:"" == tmpdir) + { + y2internal ("P: %1", p); + free_size = tointeger (p["free"]:"0") + * 1024; + used = tointeger (p["used"]:"0") * 1024; + } + }); + SCR::Execute (.target.bash, sformat ( + "/bin/umount %1", tmpdir)); + } + else + { + y2error("Mount failed, ignoring partition %1", part["device"]:""); + failed_mounts = add(failed_mounts, part); + + continue; + } } // convert into kB for TargetInitDU -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62828 - /tags/stable-2_20_0/ncurses/
by gs＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: gs Date: Thu Nov 11 13:48:38 2010 New Revision: 62828 URL: http://svn.opensuse.org/viewcvs/yast?rev=62828&view=rev Log: Created tag stable-2_20_0 for ncurses Added: tags/stable-2_20_0/ncurses/ - copied from r62827, trunk/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62827 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: gs Date: Thu Nov 11 13:48:05 2010 New Revision: 62827 URL: http://svn.opensuse.org/viewcvs/yast?rev=62827&view=rev Log: V 2.20.0 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=62827&r1=628… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Thu Nov 11 13:48:05 2010 @@ -1 +1 @@ -2.19.5 +2.20.0 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Thu Nov 11 13:48:05 2010 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Tue Oct 12 14:49:51 CEST 2010 - gs(a)suse.de -- NCRichText: bug-fix for pre tag (bnc #484629) +- NCRichText: bug-fix for pre tag (bnc #484629) +- V 2.20.0 ------------------------------------------------------------------- Wed May 12 14:55:56 CEST 2010 - gs(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62826 - /tags/stable-2_20_0/ncurses-pkg/
by gs＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: gs Date: Thu Nov 11 13:33:30 2010 New Revision: 62826 URL: http://svn.opensuse.org/viewcvs/yast?rev=62826&view=rev Log: Created tag stable-2_20_0 for ncurses-pkg Added: tags/stable-2_20_0/ncurses-pkg/ - copied from r62825, trunk/ncurses-pkg/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62825 - in /trunk/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes
by gs＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: gs Date: Thu Nov 11 13:30:38 2010 New Revision: 62825 URL: http://svn.opensuse.org/viewcvs/yast?rev=62825&view=rev Log: 2.20.0 Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=62825&r1… ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Thu Nov 11 13:30:38 2010 @@ -1 +1 @@ -2.19.5 +2.20.0 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Thu Nov 11 13:30:38 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 11 13:27:44 CET 2010 - gs(a)suse.de + +- Improve help text for status information and adjust status for + languages +- 2.20.0 + +------------------------------------------------------------------- Thu Aug 19 10:52:26 CEST 2010 - gs(a)suse.de - Show error popup if searching for packages throws an exception -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62824 - /tags/branch-SLE-10-SP4-2_13_191/packager/
by jsrain＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: jsrain Date: Thu Nov 11 09:52:59 2010 New Revision: 62824 URL: http://svn.opensuse.org/viewcvs/yast?rev=62824&view=rev Log: Created tag branch-SLE-10-SP4-2_13_191 for packager Added: tags/branch-SLE-10-SP4-2_13_191/packager/ (props changed) - copied from r62823, branches/SuSE-SLE-10-SP4-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62823 - /tags/branch-SLE-10-SP4-2_13_191/
by jsrain＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: jsrain Date: Thu Nov 11 09:52:57 2010 New Revision: 62823 URL: http://svn.opensuse.org/viewcvs/yast?rev=62823&view=rev Log: Created tag branch-SLE-10-SP4-2_13_191 Added: tags/branch-SLE-10-SP4-2_13_191/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62822 - in /branches/SuSE-SLE-10-SP4-Branch/packager: VERSION package/yast2-packager.changes src/clients/inst_kickoff.ycp
by jsrain＠svn2.opensuse.org 11 Nov '10

11 Nov '10

Author: jsrain Date: Thu Nov 11 09:52:50 2010 New Revision: 62822 URL: http://svn.opensuse.org/viewcvs/yast?rev=62822&view=rev Log: renamed the HyperV drivers (bnc#652294) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Thu Nov 11 09:52:50 2010 @@ -1 +1 @@ -2.13.190 +2.13.191 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes Thu Nov 11 09:52:50 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 11 09:48:40 CET 2010 - jsrain(a)suse.cz + +- renamed the HyperV drivers (bnc#652294) +- 2.13.191 + +------------------------------------------------------------------- Wed Nov 10 10:50:57 CET 2010 - jsrain(a)suse.cz - add virtio drivers to initrd if needed (bnc#649755) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Thu Nov 11 09:52:50 2010 @@ -61,10 +61,10 @@ if (0 == (integer)SCR::Execute(.target.bash, "LANG=C lscpu | grep 'Hypervisor vendor:[[:space:]]*Microsoft' >/dev/null")) { // add modules to initrd - Initrd::AddModule ("blkvsc", ""); - Initrd::AddModule ("netvsc", ""); - Initrd::AddModule ("storvsc", ""); - Initrd::AddModule ("vmbus", ""); + Initrd::AddModule ("hv_blkvsc", ""); + Initrd::AddModule ("hv_netvsc", ""); + Initrd::AddModule ("hv_storvsc", ""); + Initrd::AddModule ("hv_vmbus", ""); y2milestone("Added HyperV PV drivers to initrd, configured drivers: %1", Initrd::ListModules()); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62821 - /trunk/gtk/yast2-gtk.spec.in
by rpmcruz＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: rpmcruz Date: Wed Nov 10 23:35:01 2010 New Revision: 62821 URL: http://svn.opensuse.org/viewcvs/yast?rev=62821&view=rev Log: Line potentially causing warnings on build. Modified: trunk/gtk/yast2-gtk.spec.in Modified: trunk/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/yast2-gtk.spec.in?rev=62821&… ============================================================================== --- trunk/gtk/yast2-gtk.spec.in (original) +++ trunk/gtk/yast2-gtk.spec.in Wed Nov 10 23:35:01 2010 @@ -54,7 +54,6 @@ %defattr (-, root, root) %dir %_libdir/YaST2 %_libdir/YaST2/plugin/ -# %_prefix/share/YaST2/gtk/ %changelog -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62820 - in /trunk/vm: VERSION package/yast2-vm.changes src/vm_finish.ycp
by charlesa＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: charlesa Date: Wed Nov 10 23:18:38 2010 New Revision: 62820 URL: http://svn.opensuse.org/viewcvs/yast?rev=62820&view=rev Log: bnc#628256 - sysvinit: Id "x0" respawning too fast Modified: trunk/vm/VERSION trunk/vm/package/yast2-vm.changes trunk/vm/src/vm_finish.ycp Modified: trunk/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/VERSION?rev=62820&r1=62819&r2… ============================================================================== --- trunk/vm/VERSION (original) +++ trunk/vm/VERSION Wed Nov 10 23:18:38 2010 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Wed Nov 10 23:18:38 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 10 15:20:12 MST 2010 - carnold(a)novell.com + +- bnc#628256 - sysvinit: Id "x0" respawning too fast + +------------------------------------------------------------------- Thu Oct 21 11:20:32 MDT 2010 - carnold(a)novell.com - bnc#647261 - Get lot's of error in .xsession-errors when lauching Modified: trunk/vm/src/vm_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/vm_finish.ycp?rev=62820&r… ============================================================================== --- trunk/vm/src/vm_finish.ycp (original) +++ trunk/vm/src/vm_finish.ycp Wed Nov 10 23:18:38 2010 @@ -38,6 +38,7 @@ import "Arch"; import "Report"; +import "FileUtils"; any ret = nil; string func = ""; @@ -96,8 +97,15 @@ y2milestone("check for xvc0 in inittab and securetty"); if ( !contains(SCR::Dir(.etc.inittab), "x0") ) { + y2milestone("Adding the x0 entry in the inittab file"); SCR::Write (.etc.inittab.x0, sformat ("12345:respawn:/sbin/agetty -L 9600 xvc0 xterm")); SCR::Write (.etc.inittab, nil); + string dev_xvc0 = "/dev/xvc0"; + if ( ! FileUtils::Exists(dev_xvc0) ) + { + y2milestone("%1 not found, commenting out the x0 entry in the inittab", dev_xvc0); + SCR::Execute(.target.bash,"/bin/sed --in-place 's/^x0:/#x0:/g' /etc/inittab"); + } } SCR::Execute(.target.bash,"/usr/bin/grep -q xvc0 /etc/securetty || echo xvc0 >> /etc/securetty"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62819 - /trunk/gtk/src/ygtktreeview.c
by rpmcruz＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: rpmcruz Date: Wed Nov 10 21:18:34 2010 New Revision: 62819 URL: http://svn.opensuse.org/viewcvs/yast?rev=62819&view=rev Log: Fix syntax. Modified: trunk/gtk/src/ygtktreeview.c Modified: trunk/gtk/src/ygtktreeview.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtktreeview.c?rev=62819… ============================================================================== --- trunk/gtk/src/ygtktreeview.c (original) +++ trunk/gtk/src/ygtktreeview.c Wed Nov 10 21:18:34 2010 @@ -108,10 +108,8 @@ g_list_free (rows); } - GtkWidget *widget = (GtkWidget *) user_data; gtk_tree_view_convert_bin_window_to_widget_coords ( - GTK_TREE_VIEW (widget), _popup_x, _popup_y, &_popup_x, &_popup_y); - + view, _popup_x, _popup_y, &_popup_x, &_popup_y); gint x_orig, y_orig; gdk_window_get_origin (widget->window, &x_orig, &y_orig); _popup_x += x_orig; _popup_y += y_orig; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62818 - /trunk/gtk/src/ygtktreeview.c
by rpmcruz＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: rpmcruz Date: Wed Nov 10 21:07:22 2010 New Revision: 62818 URL: http://svn.opensuse.org/viewcvs/yast?rev=62818&view=rev Log: Chaned the code a little bit. Modified: trunk/gtk/src/ygtktreeview.c Modified: trunk/gtk/src/ygtktreeview.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtktreeview.c?rev=62818… ============================================================================== --- trunk/gtk/src/ygtktreeview.c (original) +++ trunk/gtk/src/ygtktreeview.c Wed Nov 10 21:07:22 2010 @@ -40,15 +40,7 @@ static void _ygtk_tree_view_menu_position_func ( GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer user_data) -{ - GtkWidget *widget = (GtkWidget *) user_data; - gtk_tree_view_convert_bin_window_to_widget_coords ( - GTK_TREE_VIEW (widget), _popup_x, _popup_y, x, y); - - gint root_x, root_y; - gdk_window_get_origin (widget->window, &root_x, &root_y); - *x += root_x; *y += root_y; -} +{ *x = _popup_x; *y = _popup_y; } void ygtk_tree_view_popup_menu (YGtkTreeView *view, GtkWidget *menu) { @@ -82,7 +74,7 @@ } _popup_time = event->time; - _popup_x = event->x; _popup_y = event->y; + _popup_x = event->x_root; _popup_y = event->y_root; gtk_widget_grab_focus (widget); g_signal_emit (widget, right_click_signal, 0, outreach); @@ -116,6 +108,14 @@ g_list_free (rows); } + GtkWidget *widget = (GtkWidget *) user_data; + gtk_tree_view_convert_bin_window_to_widget_coords ( + GTK_TREE_VIEW (widget), _popup_x, _popup_y, &_popup_x, &_popup_y); + + gint x_orig, y_orig; + gdk_window_get_origin (widget->window, &x_orig, &y_orig); + _popup_x += x_orig; _popup_y += y_orig; + g_signal_emit (widget, right_click_signal, 0, outreach); return TRUE; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62817 - /tags/stable-2_21_82/gtk/
by rpmcruz＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: rpmcruz Date: Wed Nov 10 19:06:46 2010 New Revision: 62817 URL: http://svn.opensuse.org/viewcvs/yast?rev=62817&view=rev Log: Created tag stable-2_21_82 for gtk Added: tags/stable-2_21_82/gtk/ - copied from r62816, trunk/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62816 - /tags/stable-2_21_82/
by rpmcruz＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: rpmcruz Date: Wed Nov 10 19:06:34 2010 New Revision: 62816 URL: http://svn.opensuse.org/viewcvs/yast?rev=62816&view=rev Log: Created tag stable-2_21_82 Added: tags/stable-2_21_82/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62815 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: rpmcruz Date: Wed Nov 10 19:06:29 2010 New Revision: 62815 URL: http://svn.opensuse.org/viewcvs/yast?rev=62815&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62815&r1=62814&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Wed Nov 10 19:06:29 2010 @@ -1 +1 @@ -2.21.81 +2.21.82 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62815&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Wed Nov 10 19:06:29 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "81") +SET(VERSION_PATCH "82") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Wed Nov 10 19:06:29 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Nov 10 18:07:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.82 +- tables: when pressing the context-menu key, show the popup +menu next to the selected row, not under the mouse cursor. +- sw_single: use bold for "all packages" or "all patches" row. + +------------------------------------------------------------------- Mon Nov 01 16:49:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.81 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62814 - in /trunk/gtk: ChangeLog src/pkg/ygtkpkgfilterview.cc src/pkg/ygtkpkgfilterview.h src/ygtktreeview.c
by rpmcruz＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: rpmcruz Date: Wed Nov 10 19:05:07 2010 New Revision: 62814 URL: http://svn.opensuse.org/viewcvs/yast?rev=62814&view=rev Log: * src/pkg/ygtkpkgfilterview.cc: use bold for "all packages" or "all patches" row. * src/ygtktreeview.c: when pressing the context-menu key, show the popup menu next to the selected row, not under the mouse cursor. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/ygtkpkgfilterview.cc trunk/gtk/src/pkg/ygtkpkgfilterview.h trunk/gtk/src/ygtktreeview.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62814&r1=62813… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Nov 10 19:05:07 2010 @@ -1,3 +1,12 @@ +2010-11-10 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/ygtkpkgfilterview.cc: use bold for "all + packages" or "all patches" row. + + * src/ygtktreeview.c: when pressing the context-menu + key, show the popup menu next to the selected row, not + under the mouse cursor. + 2010-11-01 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: show header bar. Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgfilterview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgfilterview.cc Wed Nov 10 19:05:07 2010 @@ -41,7 +41,7 @@ : impl (new Impl()) { GtkListStore *store = gtk_list_store_new (TOTAL_COLUMNS, GDK_TYPE_PIXBUF, - G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_INT, G_TYPE_POINTER); impl->model = GTK_TREE_MODEL (store); @@ -119,12 +119,16 @@ pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), icon, 32, GtkIconLookupFlags (0), NULL); + int weight = PANGO_WEIGHT_NORMAL; + if (firstRowIsAll() && gtk_tree_model_iter_n_children (impl->model, NULL) == 0) + weight = PANGO_WEIGHT_BOLD; + GtkTreeIter iter; GtkListStore *store = GTK_LIST_STORE (impl->model); gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, ICON_COLUMN, pixbuf, TEXT_COLUMN, text, COUNT_NUMBER_COLUMN, "", ENABLED_COLUMN, enabled, VISIBLE_COLUMN, defaultVisible, - DATA_COLUMN, data, -1); + DATA_COLUMN, data, WEIGHT_COLUMN, weight, -1); if (pixbuf) g_object_unref (pixbuf); } @@ -644,7 +648,8 @@ renderer = ygtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes ( NULL, renderer, "markup", YGtkPkgFilterModel::TEXT_COLUMN, - "sensitive", YGtkPkgFilterModel::ENABLED_COLUMN, NULL); + "sensitive", YGtkPkgFilterModel::ENABLED_COLUMN, + "weight", YGtkPkgFilterModel::WEIGHT_COLUMN, NULL); g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); gtk_tree_view_column_set_expand (column, TRUE); ygtk_tree_view_append_column (YGTK_TREE_VIEW (view), column); @@ -652,7 +657,8 @@ renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes ( NULL, renderer, "text", YGtkPkgFilterModel::COUNT_NUMBER_COLUMN, - "sensitive", YGtkPkgFilterModel::ENABLED_COLUMN, NULL); + "sensitive", YGtkPkgFilterModel::ENABLED_COLUMN, + "weight", YGtkPkgFilterModel::WEIGHT_COLUMN, NULL); g_object_set (G_OBJECT (renderer), "xalign", 1.0, "scale", PANGO_SCALE_SMALL, "foreground", "#8c8c8c", NULL); ygtk_tree_view_append_column (YGTK_TREE_VIEW (view), column); Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.h?… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgfilterview.h (original) +++ trunk/gtk/src/pkg/ygtkpkgfilterview.h Wed Nov 10 19:05:07 2010 @@ -21,7 +21,7 @@ struct YGtkPkgFilterModel // abstract { enum Column { ICON_COLUMN, TEXT_COLUMN, COUNT_NUMBER_COLUMN, - VISIBLE_COLUMN, ENABLED_COLUMN, DATA_COLUMN, TOTAL_COLUMNS }; + VISIBLE_COLUMN, ENABLED_COLUMN, WEIGHT_COLUMN, DATA_COLUMN, TOTAL_COLUMNS }; YGtkPkgFilterModel(); virtual ~YGtkPkgFilterModel(); Modified: trunk/gtk/src/ygtktreeview.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtktreeview.c?rev=62814… ============================================================================== --- trunk/gtk/src/ygtktreeview.c (original) +++ trunk/gtk/src/ygtktreeview.c Wed Nov 10 19:05:07 2010 @@ -35,6 +35,21 @@ static void _gtk_widget_destroy (gpointer widget) { gtk_widget_destroy (GTK_WIDGET (widget)); } +static guint32 _popup_time = 0; +static gint _popup_x = 0, _popup_y = 0; + +static void _ygtk_tree_view_menu_position_func ( + GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer user_data) +{ + GtkWidget *widget = (GtkWidget *) user_data; + gtk_tree_view_convert_bin_window_to_widget_coords ( + GTK_TREE_VIEW (widget), _popup_x, _popup_y, x, y); + + gint root_x, root_y; + gdk_window_get_origin (widget->window, &root_x, &root_y); + *x += root_x; *y += root_y; +} + void ygtk_tree_view_popup_menu (YGtkTreeView *view, GtkWidget *menu) { GtkWidget *widget = GTK_WIDGET (view); @@ -42,34 +57,35 @@ // emitted signals yet -- destroy it when replaced or the widget destroyed g_object_set_data_full (G_OBJECT (view), "popup", menu, _gtk_widget_destroy); - guint32 time = gtk_get_current_event_time(); gtk_menu_attach_to_widget (GTK_MENU (menu), widget, NULL); - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 3, time); + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, + _ygtk_tree_view_menu_position_func, widget, 3, _popup_time); gtk_widget_show_all (menu); } static gboolean ygtk_tree_view_button_press_event (GtkWidget *widget, GdkEventButton *event) { - // workaround (based on gedit): we want the tree view to receive this press in order - // to select the row, but we can't use connect_after, so we throw a dummy mouse press - if (event->type == GDK_BUTTON_PRESS && event->button == 3) { - static gboolean safeguard = FALSE; - if (safeguard) return FALSE; - safeguard = TRUE; - + if (event->button == 3) { GtkTreeView *view = GTK_TREE_VIEW (widget); - GtkTreeSelection *selection = gtk_tree_view_get_selection (view); - + GtkTreePath *path; gboolean outreach; - outreach = !gtk_tree_view_get_path_at_pos (view, event->x, event->y, 0, 0, 0, 0); - if (gtk_tree_selection_count_selected_rows (selection) <= 1) { - // if there is a selection, let it be - event->button = 1; - if (!gtk_widget_event (widget, (GdkEvent *) event)) - return FALSE; + outreach = gtk_tree_view_get_path_at_pos (view, event->x, event->y, &path, NULL, NULL, NULL); + if (outreach) { // select row if it is not + GtkTreeSelection *selection = gtk_tree_view_get_selection (view); + GtkTreeModel *model = gtk_tree_view_get_model (view); + GtkTreeIter iter; + gtk_tree_model_get_iter (model, &iter, path); + + if (!gtk_tree_selection_iter_is_selected (selection, &iter)) + gtk_tree_view_set_cursor (view, path, NULL, FALSE); + gtk_tree_path_free (path); } + + _popup_time = event->time; + _popup_x = event->x; _popup_y = event->y; + + gtk_widget_grab_focus (widget); g_signal_emit (widget, right_click_signal, 0, outreach); - safeguard = FALSE; return TRUE; } return GTK_WIDGET_CLASS (ygtk_tree_view_parent_class)->button_press_event (widget, event); @@ -81,6 +97,25 @@ GtkTreeSelection *selection = gtk_tree_view_get_selection (view); gboolean outreach = gtk_tree_selection_count_selected_rows (selection) == 0; + _popup_time = gtk_get_current_event_time(); + if (outreach) + _popup_x = (_popup_y = 0); + else { + GList *rows = gtk_tree_selection_get_selected_rows (selection, NULL); + GtkTreePath *path = (GtkTreePath *) g_list_last (rows)->data; + + // in case that path is not visible: + gtk_tree_view_scroll_to_cell (view, path, NULL, FALSE, 0, 0); + + GdkRectangle rect; + gtk_tree_view_get_cell_area (view, path, NULL, &rect); + _popup_x = 0; + _popup_y = rect.y + rect.height; + + g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL); + g_list_free (rows); + } + g_signal_emit (widget, right_click_signal, 0, outreach); return TRUE; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62813 - /tags/stable-2_20_10/packager/
by lslezak＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: lslezak Date: Wed Nov 10 18:56:02 2010 New Revision: 62813 URL: http://svn.opensuse.org/viewcvs/yast?rev=62813&view=rev Log: Created tag stable-2_20_10 for packager Added: tags/stable-2_20_10/packager/ - copied from r62812, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62812 - /tags/stable-2_20_10/
by lslezak＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: lslezak Date: Wed Nov 10 18:56:00 2010 New Revision: 62812 URL: http://svn.opensuse.org/viewcvs/yast?rev=62812&view=rev Log: Created tag stable-2_20_10 Added: tags/stable-2_20_10/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62811 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/PackageSlideShow.ycp src/modules/SlideShowCallbacks.ycp
by lslezak＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: lslezak Date: Wed Nov 10 18:55:53 2010 New Revision: 62811 URL: http://svn.opensuse.org/viewcvs/yast?rev=62811&view=rev Log: - update the number of the remaining packages when package installation is finished, display it at the beginning (bnc#473822) - reset the list of packages so the next run displays correct values (used when PKGMGR_ACTION_AT_EXIT == "summary") - 2.20.10 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageSlideShow.ycp trunk/packager/src/modules/SlideShowCallbacks.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62811&r1=62… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Nov 10 18:55:53 2010 @@ -1 +1 @@ -2.20.9 +2.20.10 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Nov 10 18:55:53 2010 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Nov 10 17:20:53 UTC 2010 - lslezak(a)suse.cz + +- update the number of the remaining packages when package + installation is finished, display it at the beginning + (bnc#473822) +- reset the list of packages so the next run displays correct + values (used when PKGMGR_ACTION_AT_EXIT == "summary") +- 2.20.10 + +------------------------------------------------------------------- Wed Nov 3 13:44:55 UTC 2010 - lslezak(a)suse.cz - don't reset package selection in dirinstall mode when target Modified: trunk/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageSlid… ============================================================================== --- trunk/packager/src/modules/PackageSlideShow.ycp (original) +++ trunk/packager/src/modules/PackageSlideShow.ycp Wed Nov 10 18:55:53 2010 @@ -82,6 +82,10 @@ total_installed = 0; // avg_download_rate = 0; + installed_packages_list = []; + updated_packages_list = []; + removed_packages_list = []; + // temporary values current_provide_size = 0; current_install_size = 0; @@ -853,7 +857,7 @@ (TotalInstalledSize() * (100 - downloading_pct) / total_size_to_install); } - y2internal("Total package installation progress: %1%%", total_progress); + y2debug("Total package installation progress: %1%%", total_progress); SlideShow::StageProgress( total_progress, nil ); } @@ -1013,6 +1017,23 @@ SlideShow::SubProgress( pkg_percent, new_text ); } + global void DisplayGlobalProgress() + { + string rem_string = ""; + integer tot_rem_t = TotalRemainingTime(); + + rem_string = ( unit_is_seconds && bytes_per_second > 0 && tot_rem_t > 0) ? + sformat("%1 / %2", FormatRemainingSize(TotalRemainingSize()), FormatTimeShowOverflow(tot_rem_t)) + : FormatRemainingSize(TotalRemainingSize()); + + if (rem_string != "") + { + rem_string = rem_string + ", "; + } + + SlideShow::SetGlobalProgressLabel( SlideShow::CurrentStageDescription() + sformat(_(" (Remaining: %1%2 packages)"), rem_string, TotalRemainingPkgCount())); + } + global void DoneProvide( integer error, string reason, string name ) { if (error == 0) @@ -1090,6 +1111,9 @@ UpdateTotalProgress(false); + // Update global progress bar + DisplayGlobalProgress(); + if (updating) { updated_packages = updated_packages + 1; @@ -1191,13 +1215,7 @@ SlideShow::SubProgress( 0, msg ); // Update global progress bar - string rem_string = ""; - integer tot_rem_t = TotalRemainingTime(); - - rem_string = ( unit_is_seconds && bytes_per_second > 0 && tot_rem_t > 0) ? - sformat("%1 / %2", FormatRemainingSize(TotalRemainingSize()), FormatTimeShowOverflow(tot_rem_t)) - : FormatRemainingSize(TotalRemainingSize()); - SlideShow::SetGlobalProgressLabel( SlideShow::CurrentStageDescription() + sformat(_(" (Remaining: %1, %2 packages)"), rem_string, TotalRemainingPkgCount())); + DisplayGlobalProgress(); // // Update (user visible) installation log Modified: trunk/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShowCa… ============================================================================== --- trunk/packager/src/modules/SlideShowCallbacks.ycp (original) +++ trunk/packager/src/modules/SlideShowCallbacks.ycp Wed Nov 10 18:55:53 2010 @@ -121,7 +121,7 @@ } if (SlideShow::GetUserAbort()) { - return "CANCEL"; + return "C"; } if (error != 0) { @@ -508,6 +508,9 @@ PackageSlideShow::SetCurrentCdNo( source, media ); PackageSlideShow::UpdateCurrentPackageProgress(0); PackageSlideShow::UpdateAllCdProgress(false); + + // display remaining packages + PackageSlideShow::DisplayGlobalProgress(); }; global string MediaChange (string error_code, string error, string url, string product, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62810 - /tags/stable-2_20_2/security/
by jsuchome＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: jsuchome Date: Wed Nov 10 17:08:11 2010 New Revision: 62810 URL: http://svn.opensuse.org/viewcvs/yast?rev=62810&view=rev Log: Created tag stable-2_20_2 for security Added: tags/stable-2_20_2/security/ - copied from r62809, trunk/security/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62809 - in /trunk/security: VERSION package/yast2-security.changes src/Security.ycp
by jsuchome＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: jsuchome Date: Wed Nov 10 17:07:59 2010 New Revision: 62809 URL: http://svn.opensuse.org/viewcvs/yast?rev=62809&view=rev Log: - remember the default value of CRACKLIB_DICT_PATH (bnc#650425) - 2.20.2 Modified: trunk/security/VERSION trunk/security/package/yast2-security.changes trunk/security/src/Security.ycp Modified: trunk/security/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/VERSION?rev=62809&r1=62… ============================================================================== --- trunk/security/VERSION (original) +++ trunk/security/VERSION Wed Nov 10 17:07:59 2010 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.… ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Wed Nov 10 17:07:59 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 10 14:19:15 CET 2010 - jsuchome(a)suse.cz + +- remember the default value of CRACKLIB_DICT_PATH (bnc#650425) +- 2.20.2 + +------------------------------------------------------------------- Mon Aug 16 13:30:29 CEST 2010 - jsuchome(a)suse.cz - removed 'disable' from descriptions of settings (bnc#610944) Modified: trunk/security/src/Security.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/Security.ycp?rev=62… ============================================================================== --- trunk/security/src/Security.ycp (original) +++ trunk/security/src/Security.ycp Wed Nov 10 17:07:59 2010 @@ -397,6 +397,8 @@ map pam_cracklib = Pam::Query ("cracklib"); if (size (pam_cracklib) > 0) Settings ["PASSWD_USE_CRACKLIB"] = "yes"; + // save the default value + Settings ["CRACKLIB_DICT_PATH"] = "/usr/lib/cracklib_dict"; foreach (string val, pam_cracklib["password"]:[], { list lval = splitstring (val, "="); if (issubstring (val, "dictpath=")) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62808 - /branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes
by varkoly＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: varkoly Date: Wed Nov 10 15:30:48 2010 New Revision: 62808 URL: http://svn.opensuse.org/viewcvs/yast?rev=62808&view=rev Log: Fix the change log Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ntp-cl… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes (original) +++ branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes Wed Nov 10 15:30:48 2010 @@ -4,11 +4,6 @@ - bnc#619782 Time zone configuration during initial installation. ------------------------------------------------------------------- -Wed Apr 21 16:39:38 CEST 2010 - varkoly(a)suse.de - -- Remove missleading depracated input field - -------------------------------------------------------------------- Thu Sep 2 11:21:09 CEST 2010 - jsuchome(a)suse.cz - provide public API for info about time synchronization without @@ -16,6 +11,16 @@ - 2.20.0 ------------------------------------------------------------------- +Thu Jun 24 06:00:41 UTC 2010 - varkoly(a)novell.com + +- bnc#598856 - empty NTP server list on time setup + +------------------------------------------------------------------- +Wed Apr 21 16:39:38 CEST 2010 - varkoly(a)suse.de + +- Remove missleading depracated input field + +------------------------------------------------------------------- Fri Apr 9 15:24:42 UTC 2010 - varkoly(a)novell.com - Initial version of time synchronization without running ntp as deamon -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62807 - /trunk/ntp-client/package/yast2-ntp-client.changes
by varkoly＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: varkoly Date: Wed Nov 10 15:30:02 2010 New Revision: 62807 URL: http://svn.opensuse.org/viewcvs/yast?rev=62807&view=rev Log: Fix the change log Modified: trunk/ntp-client/package/yast2-ntp-client.changes Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli… ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Wed Nov 10 15:30:02 2010 @@ -11,6 +11,11 @@ - 2.20.0 ------------------------------------------------------------------- +Thu Jun 24 06:00:41 UTC 2010 - varkoly(a)novell.com + +- bnc#598856 - empty NTP server list on time setup + +------------------------------------------------------------------- Wed Apr 21 16:39:38 CEST 2010 - varkoly(a)suse.de - Remove missleading depracated input field -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62806 - /trunk/ntp-client/package/yast2-ntp-client.changes
by varkoly＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: varkoly Date: Wed Nov 10 15:29:00 2010 New Revision: 62806 URL: http://svn.opensuse.org/viewcvs/yast?rev=62806&view=rev Log: Fix the change log Modified: trunk/ntp-client/package/yast2-ntp-client.changes Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli… ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Wed Nov 10 15:29:00 2010 @@ -4,11 +4,6 @@ - bnc#619782 Time zone configuration during initial installation. ------------------------------------------------------------------- -Wed Apr 21 16:39:38 CEST 2010 - varkoly(a)suse.de - -- Remove missleading depracated input field - -------------------------------------------------------------------- Thu Sep 2 11:21:09 CEST 2010 - jsuchome(a)suse.cz - provide public API for info about time synchronization without @@ -16,6 +11,11 @@ - 2.20.0 ------------------------------------------------------------------- +Wed Apr 21 16:39:38 CEST 2010 - varkoly(a)suse.de + +- Remove missleading depracated input field + +------------------------------------------------------------------- Fri Apr 9 15:24:42 UTC 2010 - varkoly(a)novell.com - Initial version of time synchronization without running ntp as deamon -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62805 - /tags/branch-Linux-11_3-2_18_1/ntp-client/
by varkoly＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: varkoly Date: Wed Nov 10 15:22:42 2010 New Revision: 62805 URL: http://svn.opensuse.org/viewcvs/yast?rev=62805&view=rev Log: Created tag branch-Linux-11_3-2_18_1 for ntp-client Added: tags/branch-Linux-11_3-2_18_1/ntp-client/ (props changed) - copied from r62804, branches/SuSE-Linux-11_3-Branch/ntp-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62804 - in /branches/SuSE-Linux-11_3-Branch/ntp-client: data/ntp_servers.ycp package/yast2-ntp-client.changes src/NtpClient.ycp src/ntp-client_proposal.ycp
by varkoly＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: varkoly Date: Wed Nov 10 15:20:40 2010 New Revision: 62804 URL: http://svn.opensuse.org/viewcvs/yast?rev=62804&view=rev Log: Merge with trunk for update Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/data/ntp_servers.ycp branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp branches/SuSE-Linux-11_3-Branch/ntp-client/src/ntp-client_proposal.ycp Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/data/ntp_servers.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ntp-cl… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ntp-client/data/ntp_servers.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ntp-client/data/ntp_servers.ycp Wed Nov 10 15:20:40 2010 @@ -46,15 +46,6 @@ "synchronization" : "xntpd (stratum 2), linux/unix", ], $[ - "access_policy" : "Open access to stratum 2 and stratum 3 NTP servers. Please, send a mail to notify.", - "address" : "ntp.cais.rnp.br", - "country" : "BR", - "exact_location" : "RNP - Brazilian Research Network/Rede Nacional de Pesquisa", - "location" : "Brazil", - "stratum" : "2", - "synchronization" : "NTP V4 Secondary (stratum 2), FreeBSD/UNIX", - ], - $[ "access_policy" : "Open access to stratum 3 server. Please, send a mail to notify.", "address" : "ntp.pop-pr.rnp.br", "country" : "BR", @@ -156,15 +147,6 @@ ], $[ "access_policy" : "open access", - "address" : "ntp.globe.cz", - "country" : "CZ", - "exact_location" : "Prague, The Czech Republic", - "location" : "Czech Republic", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), PC/Linux", - ], - $[ - "access_policy" : "open access", "address" : "ntp.karpo.cz", "country" : "CZ", "exact_location" : "Prague, The Czech Republic", @@ -174,15 +156,6 @@ ], $[ "access_policy" : "open access", - "address" : "ntp1.contactel.cz", - "country" : "CZ", - "exact_location" : "Prague, The Czech Republic", - "location" : "Czech Republic", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), PC/Linux", - ], - $[ - "access_policy" : "open access", "address" : "ntp2.contactel.cz", "country" : "CZ", "exact_location" : "Prague, The Czech Republic", @@ -191,13 +164,6 @@ "synchronization" : "NTP V4 secondary (stratum 2), PC/Linux", ], $[ - "address" : "tack.fh-augsburg.de", - "country" : "DE", - "exact_location" : "Augsburg University of Applied Sciences (FH), Augsburg, Bavaria, Germany", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), i486/Linux", - ], - $[ "address" : "tick.fh-augsburg.de", "country" : "DE", "exact_location" : "Augsburg University of Applied Sciences (FH), Augsburg, Bavaria, Germany", @@ -271,16 +237,6 @@ "synchronization" : "NTP V3 secondary (stratum 2), i686/FreeBSD", ], $[ - "access_policy" : "open access", - "address" : "ntp.cuhk.edu.hk", - "coordinates" : "22:25:10N, 114:12:22E", - "country" : "HK", - "exact_location" : "The Chinese University of Hong Kong.", - "location" : "Hong Kong, Taiwan, China, and South East Asia", - "stratum" : "2", - "synchronization" : "NTP V3 secondary (stratum 2), i686/Linux", - ], - $[ "access_policy" : "open access, glad to receive a note", "address" : "os.ntp.carnet.hr", "country" : "HR", @@ -344,22 +300,6 @@ "synchronization" : "NTPV4 secondary (stratum 2), Intel, FreeBSD 2.2", ], $[ - "address" : "ntps.net4u.it", - "country" : "IT", - "exact_location" : "4u Srl, Vercelli, Italy", - "stratum" : "2", - "synchronization" : "NTP secondary (stratum 2), Linux 2 on Intel PIII 500MHz", - ], - $[ - "access_policy" : "open access", - "address" : "ntp.doubleukay.com", - "country" : "MY", - "exact_location" : "Cyberjaya, Malaysia", - "location" : "Malaysia", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), Intel/Linux", - ], - $[ "access_policy" : "open access", "address" : "fartein.ifi.uio.no", "coordinates" : "59:56:32N, 10:43:22E", @@ -485,7 +425,7 @@ $[ "access_policy" : "open access", "address" : "a.ntp.alphazed.net", - "country" : "UK", + "country" : "GB", "exact_location" : "Telehouse, London E14", "location" : "all areas", "stratum" : "2", @@ -501,18 +441,10 @@ "synchronization" : "NTP V4 Secondary (stratum 2), Sun SPARC10/Solaris,", ], $[ - "access_policy" : "Open Access", - "address" : "bear.zoo.bt.co.uk", - "country" : "UK", - "exact_location" : "BT Adastral Park, Ipswich, England", - "location" : "UK", - "stratum" : "2", - ], - $[ "access_policy" : "open access", "address" : "ntp.cis.strath.ac.uk", "coordinates" : "04:14W, 55:52N", - "country" : "UK", + "country" : "GB", "exact_location" : "Dept. Computer and Information Sciences, University of Strathclyde, Glasgow, Scotland.", "location" : "UK/Europe", "stratum" : "2", @@ -521,49 +453,49 @@ $[ "access_policy" : "Open Access", "address" : "ntp2a.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), Sun/SunOS", ], $[ "access_policy" : "Open Access", "address" : "ntp2b.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), PC/FreeBSD", ], $[ "access_policy" : "Open Access", "address" : "ntp2c.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), PC/FreeBSD", ], $[ "access_policy" : "Open Access", "address" : "ntp2d.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), SGI/Irix", ], $[ "address" : "ntp", - "country" : "UK", + "country" : "GB", "exact_location" : "Telehouse Europe, London E14.Geographic Coordinates: 51°30.71'N 0°00.08'W", "stratum" : "2", ], $[ "access_policy" : "Semi-open access. These are primarily for use by UUNET customers who may use them without asking, but others are welcome to peer if they give notice.", "address" : "ntp0.uk.uu.net", - "country" : "UK", + "country" : "GB", "exact_location" : "Cambridge, UK", "location" : "UUNET (formerly known in the UK as PIPEX); UK", "stratum" : "2", @@ -571,7 +503,7 @@ $[ "access_policy" : "Semi-open access. These are primarily for use by UUNET customers who may use them without asking, but others are welcome to peer if they give notice.", "address" : "ntp1.uk.uu.net", - "country" : "UK", + "country" : "GB", "exact_location" : "Cambridge, UK", "location" : "UUNET (formerly known in the UK as PIPEX); UK", "stratum" : "2", @@ -579,7 +511,7 @@ $[ "access_policy" : "Semi-open access. These are primarily for use by UUNET customers who may use them without asking, but others are welcome to peer if they give notice.", "address" : "ntp2.uk.uu.net", - "country" : "UK", + "country" : "GB", "exact_location" : "London, UK", "location" : "UUNET (formerly known in the UK as PIPEX); UK", "stratum" : "2", @@ -615,17 +547,6 @@ "synchronization" : "NTP secondary (stratum 2)", ], $[ - "access_policy" : "Open Access, please drop us a note so we can add you to our mailing list.", - "address" : "ntp1.mainecoon.com", - "coordinates" : "39:56.863N, 120:54.657W", - "country" : "US", - "exact_location" : "Quincy, California", - "location" : "North America", - "state" : "CA ", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2) P-II/X86 Solaris 2.7", - ], - $[ "access_policy" : "open access, please send a message to notify", "address" : "ntp1.sf-bay.org", "country" : "US", @@ -781,16 +702,6 @@ "synchronization" : "NTP V3 secondary (stratum 2), Linux on Intel", ], $[ - "access_policy" : "open access", - "address" : "ntp.ourconcord.net", - "country" : "US", - "exact_location" : "Concord, MA", - "location" : "Eastern time zone", - "state" : "MA ", - "stratum" : "2", - "synchronization" : "NTP v4 stratum 2, Linux", - ], - $[ "access_policy" : "open access, please send a message to notify.", "address" : "ns.nts.umn.edu", "country" : "US", @@ -914,17 +825,6 @@ "synchronization" : "NTP secondary (stratum 2), Sun/Unix", ], $[ - "access_policy" : "open access", - "address" : "reva.sixgirls.org", - "coordinates" : "40:42:20N, 74:0:40W", - "country" : "US", - "exact_location" : "The NYITC Building, 55 Broad Street, New York City, NY", - "location" : "New York, New Jersey, Connecticut, Long Island areas", - "state" : "NY ", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), m68k/NetBSD", - ], - $[ "access_policy" : "open access; please use name rather than address.", "address" : "sundial.columbia.edu", "country" : "US", @@ -1106,31 +1006,6 @@ "synchronization" : "NTP V4 secondary Solaris 2.7", ], $[ - "address" : "ntp.cs.unp.ac.za", - "country" : "ZA", - "exact_location" : "Natal University, Pietermaritzburg, South Africa", - "stratum" : "2", - "synchronization" : "NTP V3 secondary (stratum 2), SGI Indy/Irix6.2", - ], - $[ - "access_policy" : "open access", - "address" : "tock.nml.csir.co.za", - "coordinates" : "25,7461 S 28,2770 E (WGS-84)", - "country" : "ZA", - "exact_location" : "Pretoria, South Africa", - "location" : "Southern Africa", - "stratum" : "2", - "synchronization" : "NTP secondary (stratum 2), i386/FreeBSD", - ], - $[ - "address" : "ntp0.coreng.com.au", - "coordinates" : "33:50S 151:09E", - "country" : "AU", - "exact_location" : "Corinthian Engineering P/L, Sydney Australia.", - "stratum" : "1", - "synchronization" : "NTP V4 primary (Trimble Acutime GPS+PPS), i386/FreeBSD 4-STABLE.", - ], - $[ "address" : "ntp0.cs.mu.OZ.AU", "coordinates" : "37:48:09.60S 144:57:29.50E", "country" : "AU", @@ -1158,26 +1033,6 @@ "synchronization" : "NTP V4 Primary (GPS clock), PC/FreeBSD", ], $[ - "access_policy" : "open access, prior arrangment required", - "address" : "tick.usask.ca", - "coordinates" : "52:08:01N,106:38:11W", - "country" : "CA", - "exact_location" : "University oc Saskatchewan, Saskatoon, Saskatchewan, SK, Canada", - "location" : "SASK#net, CA*net, Canada", - "stratum" : "1", - "synchronization" : "NTP V3 Primary (GOES clock), DEC Mips/Unix", - ], - $[ - "access_policy" : "open access, prior arrangment required", - "address" : "tock.usask.ca", - "coordinates" : "52:08:01N,106:38:11W", - "country" : "CA", - "exact_location" : "University oc Saskatchewan, Saskatoon, Saskatchewan, SK, Canada", - "location" : "SASK#net, CA*net, Canada", - "stratum" : "1", - "synchronization" : "NTP V3 Primary (GOES clock), DEC Mips/Unix", - ], - $[ "access_policy" : "open access, please send a message to notify", "address" : "ntp.metas.ch", "coordinates" : "N 46:55:25 E 07:27:51", @@ -1288,27 +1143,6 @@ "synchronization" : "NTP V3 primary (GPS), PC/Linux", ], $[ - "address" : "ntp1.curie.fr", - "country" : "FR", - "exact_location" : "Institut Curie, Section de Recherche, Paris, France.", - "stratum" : "1", - "synchronization" : "Coetanian TSS100 NTP V3 GPS", - ], - $[ - "address" : "ntp2.curie.fr", - "country" : "FR", - "exact_location" : "Institut Curie, Section de Recherche, Paris, France.", - "stratum" : "1", - "synchronization" : "Datum 2100L NTP V3 GPS", - ], - $[ - "address" : "ntp3.curie.fr", - "country" : "FR", - "exact_location" : "Institut Curie, Section de Recherche, Paris, France.", - "stratum" : "1", - "synchronization" : "Truetime NTS100 GPS", - ], - $[ "access_policy" : "open access, please send a message to notify", "address" : "ntp-galway.hea.net", "country" : "IE", @@ -1527,7 +1361,7 @@ $[ "access_policy" : "closed access, see notes below.", "address" : "ntp2.ja.net", - "country" : "UK", + "country" : "GB", "exact_location" : "University of London Computer Centre, UK", "location" : "JANET", "stratum" : "1", @@ -1613,17 +1447,6 @@ "synchronization" : "NTP V3 primary GPS Clock", ], $[ - "access_policy" : "Open to stratum 2 servers for 10 or more hosts, others upon request", - "address" : "tick.gpsclock.com", - "coordinates" : "33:50:26.510N, 118:22:55.245W", - "country" : "US", - "exact_location" : "GPSClock.com headquarters, Redondo Beach, CA", - "location" : "US Pacific, Los Angeles area", - "state" : "CA ", - "stratum" : "1", - "synchronization" : "NTP V4 primary, GPSClock 300 hard PPS, FreeBSD", - ], - $[ "address" : "tick.ucla.edu", "country" : "US", "exact_location" : "UCLA, Los Angeles, CA", @@ -1732,17 +1555,6 @@ ], $[ "access_policy" : "closed access, except for stratum-2 servers providing synchronization to local networks of ten or more hosts", - "address" : "ntp1.nss.udel.edu", - "coordinates" : "39:40:35.8N, 75:44:36.6W (GPS WGS 84)", - "country" : "US", - "exact_location" : "University of Delaware, Newark, DE", - "location" : "BBN Planet SER", - "state" : "DE ", - "stratum" : "1", - "synchronization" : "NTP V3 Primary (GPS clock), TrueTime NTS-100-GPS", - ], - $[ - "access_policy" : "closed access, except for stratum-2 servers providing synchronization to local networks of ten or more hosts", "address" : "rackety.udel.edu", "coordinates" : "39:40:48.425N, 75:45:02.392W (GPS WGS84)", "country" : "US", @@ -1801,16 +1613,6 @@ "synchronization" : "NTP V3 primary (Brandywine Syncclock32/Oncore GPS)", ], $[ - "access_policy" : "closed access except for peers that meet the three conditions outlined in the "Time Servers" section of this file. State agreement with those conditions in notification message. All others may use the ntp-{0,1,2}.cso.uiuc.edu stratum 2 servers.", - "address" : "truechimer.cso.uiuc.edu", - "country" : "US", - "exact_location" : "University of Illinois, Urbana-Champaign, IL", - "location" : "CICNET, Midwest, NCSA region", - "state" : "IL ", - "stratum" : "1", - "synchronization" : "NTP V3 primary (WWVB clock), IBM-RS6000/250", - ], - $[ "access_policy" : "open access to significant stratum 2 servers in the service areas.", "address" : "tick.cerias.purdue.edu", "coordinates" : "40:25:33.2N, 86:54:54.7W (GPS)", @@ -1851,16 +1653,6 @@ "synchronization" : "NTP V4 primary, Motorola Oncore VP GPS, Linux", ], $[ - "access_policy" : "open access to stratum-2 servers and to MIT clients", - "address" : "tick.mit.edu", - "country" : "US", - "exact_location" : "Massachusetts Institute of Technology, Cambridge, MA", - "location" : "eastern time zone, others on request", - "state" : "MA ", - "stratum" : "1", - "synchronization" : "NTP V3 primary (GPS) HP9000/747i", - ], - $[ "access_policy" : "open access", "address" : "time.keneli.org", "country" : "US", @@ -1901,15 +1693,6 @@ "synchronization" : "NTP V3 primary (GPS) HP9000/747i", ], $[ - "access_policy" : "NC-REN region, other use by prior arrangement", - "address" : "ncnoc.ncren.net", - "country" : "US", - "exact_location" : "MCNC, Research Triangle Park, NC", - "state" : "NC ", - "stratum" : "1", - "synchronization" : "NTP V3 primary (WWVB clock), Netclock/2, Sun 4/65", - ], - $[ "access_policy" : "Closed access, except for stratum-2 servers providing synchronization to local networks of ten or more hosts; others by arrangement only. Please send a message to notify.", "address" : "ntp0.jensenresearch.com", "coordinates" : "41 00.975 N, 74 15.262 W Synchronization: NTP V4 primary; Præcis Ct CDMA clock; Intel PIII/866 Win2K", Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ntp-cl… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes (original) +++ branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes Wed Nov 10 15:20:40 2010 @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Wed Nov 10 15:11:04 CEST 2010 - varkoly(a)novell.com + +- bnc#619782 Time zone configuration during initial installation. + +------------------------------------------------------------------- +Wed Apr 21 16:39:38 CEST 2010 - varkoly(a)suse.de + +- Remove missleading depracated input field + +------------------------------------------------------------------- +Thu Sep 2 11:21:09 CEST 2010 - jsuchome(a)suse.cz + +- provide public API for info about time synchronization without + daemon running (bnc#627818) +- 2.20.0 + +------------------------------------------------------------------- Fri Apr 9 15:24:42 UTC 2010 - varkoly(a)novell.com - Initial version of time synchronization without running ntp as deamon Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ntp-cl… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp Wed Nov 10 15:20:40 2010 @@ -216,8 +216,14 @@ } map<string, string> MakePoolRecord (string CC, string location) { + string mycc = tolower(CC); + //There is no gb.pool.ntp.org only uk.pool.ntp.org + if ( mycc == "gb" ) + { + mycc="uk"; + } return $[ - "address" : tolower(CC) + ".pool.ntp.org", + "address" : mycc + ".pool.ntp.org", "country" : CC, "location": location, ]; @@ -434,6 +440,28 @@ } /** + * Read the synchronization status, fill + * synchronize_time and sync_interval variables + * Return updated value of synchronize_time + */ +global boolean ReadSynchronization () { + + list crontab = (list)SCR::Read(.cron, cron_file, ""); + y2milestone("CRONTAB %1", crontab); + string tmp = (string) crontab[0,"events",0,"active"]:"0"; + synchronize_time = tmp == "1"; + tmp = (string) crontab[0,"events",0,"minute"]:"*/5"; + y2milestone("MINUTE %1", tmp); + list pos = regexppos(tmp, "[0-9]+"); + string tmp2 = substring(tmp,pos[0]:0,pos[1]:0); + sync_interval = tointeger(tmp2); + y2milestone("SYNC_INTERVAL %1", sync_interval); + + return synchronize_time; +} + + +/** * Read all ntp-client settings * @return true on success */ @@ -518,16 +546,8 @@ if (! Mode::commandline() && ! FileChanges::CheckFiles (["/etc/ntp.conf"])) failed = true; ProcessNtpConf(); - list crontab = (list)SCR::Read(.cron, cron_file, ""); - y2milestone("CRONTAB %1", crontab); - string tmp = (string) crontab[0,"events",0,"active"]:"0"; - synchronize_time = tmp == "1"; - tmp = (string) crontab[0,"events",0,"minute"]:"*/5"; - y2milestone("MINUTE %1", tmp); - list pos = regexppos(tmp, "[0-9]+"); - string tmp2 = substring(tmp,pos[0]:0,pos[1]:0); - sync_interval = tointeger(tmp2); - y2milestone("SYNC_INTERVAL %1", sync_interval); + + ReadSynchronization (); string run_chroot_s = (string) SCR::Read (.sysconfig.ntp.NTPD_RUN_CHROOTED); run_chroot = run_chroot_s == "yes"; Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/src/ntp-client_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ntp-cl… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ntp-client/src/ntp-client_proposal.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ntp-client/src/ntp-client_proposal.ycp Wed Nov 10 15:20:40 2010 @@ -77,7 +77,11 @@ } boolean GetNTPEnabled () { - return Service::Enabled (NtpClient::service_name); + + if (!Stage::initial()) + NtpClient::ReadSynchronization (); + + return NtpClient::synchronize_time || Service::Enabled (NtpClient::service_name); } boolean ValidateSingleServer( string ntp_server ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62803 - /trunk/ntp-client/package/yast2-ntp-client.changes
by varkoly＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: varkoly Date: Wed Nov 10 15:13:14 2010 New Revision: 62803 URL: http://svn.opensuse.org/viewcvs/yast?rev=62803&view=rev Log: 619782 - Time zone configuration during initial installation. Modified: trunk/ntp-client/package/yast2-ntp-client.changes Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli… ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Wed Nov 10 15:13:14 2010 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Nov 10 15:11:04 CEST 2010 - varkoly(a)novell.com + +- bnc#619782 Time zone configuration during initial installation. + +------------------------------------------------------------------- +Wed Apr 21 16:39:38 CEST 2010 - varkoly(a)suse.de + +- Remove missleading depracated input field + +------------------------------------------------------------------- Thu Sep 2 11:21:09 CEST 2010 - jsuchome(a)suse.cz - provide public API for info about time synchronization without -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62802 - /trunk/ntp-client/src/NtpClient.ycp
by varkoly＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: varkoly Date: Wed Nov 10 15:09:35 2010 New Revision: 62802 URL: http://svn.opensuse.org/viewcvs/yast?rev=62802&view=rev Log: Convert gb to uk Modified: trunk/ntp-client/src/NtpClient.ycp Modified: trunk/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/NtpClient.ycp?rev… ============================================================================== --- trunk/ntp-client/src/NtpClient.ycp (original) +++ trunk/ntp-client/src/NtpClient.ycp Wed Nov 10 15:09:35 2010 @@ -216,8 +216,14 @@ } map<string, string> MakePoolRecord (string CC, string location) { + string mycc = tolower(CC); + //There is no gb.pool.ntp.org only uk.pool.ntp.org + if ( mycc == "gb" ) + { + mycc="uk"; + } return $[ - "address" : tolower(CC) + ".pool.ntp.org", + "address" : mycc + ".pool.ntp.org", "country" : CC, "location": location, ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62801 - /trunk/ntp-client/data/ntp_servers.ycp
by varkoly＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: varkoly Date: Wed Nov 10 15:08:43 2010 New Revision: 62801 URL: http://svn.opensuse.org/viewcvs/yast?rev=62801&view=rev Log: Remove not accassable ntp servers Modified: trunk/ntp-client/data/ntp_servers.ycp Modified: trunk/ntp-client/data/ntp_servers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/data/ntp_servers.ycp?… ============================================================================== --- trunk/ntp-client/data/ntp_servers.ycp (original) +++ trunk/ntp-client/data/ntp_servers.ycp Wed Nov 10 15:08:43 2010 @@ -46,15 +46,6 @@ "synchronization" : "xntpd (stratum 2), linux/unix", ], $[ - "access_policy" : "Open access to stratum 2 and stratum 3 NTP servers. Please, send a mail to notify.", - "address" : "ntp.cais.rnp.br", - "country" : "BR", - "exact_location" : "RNP - Brazilian Research Network/Rede Nacional de Pesquisa", - "location" : "Brazil", - "stratum" : "2", - "synchronization" : "NTP V4 Secondary (stratum 2), FreeBSD/UNIX", - ], - $[ "access_policy" : "Open access to stratum 3 server. Please, send a mail to notify.", "address" : "ntp.pop-pr.rnp.br", "country" : "BR", @@ -156,15 +147,6 @@ ], $[ "access_policy" : "open access", - "address" : "ntp.globe.cz", - "country" : "CZ", - "exact_location" : "Prague, The Czech Republic", - "location" : "Czech Republic", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), PC/Linux", - ], - $[ - "access_policy" : "open access", "address" : "ntp.karpo.cz", "country" : "CZ", "exact_location" : "Prague, The Czech Republic", @@ -174,15 +156,6 @@ ], $[ "access_policy" : "open access", - "address" : "ntp1.contactel.cz", - "country" : "CZ", - "exact_location" : "Prague, The Czech Republic", - "location" : "Czech Republic", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), PC/Linux", - ], - $[ - "access_policy" : "open access", "address" : "ntp2.contactel.cz", "country" : "CZ", "exact_location" : "Prague, The Czech Republic", @@ -191,13 +164,6 @@ "synchronization" : "NTP V4 secondary (stratum 2), PC/Linux", ], $[ - "address" : "tack.fh-augsburg.de", - "country" : "DE", - "exact_location" : "Augsburg University of Applied Sciences (FH), Augsburg, Bavaria, Germany", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), i486/Linux", - ], - $[ "address" : "tick.fh-augsburg.de", "country" : "DE", "exact_location" : "Augsburg University of Applied Sciences (FH), Augsburg, Bavaria, Germany", @@ -271,16 +237,6 @@ "synchronization" : "NTP V3 secondary (stratum 2), i686/FreeBSD", ], $[ - "access_policy" : "open access", - "address" : "ntp.cuhk.edu.hk", - "coordinates" : "22:25:10N, 114:12:22E", - "country" : "HK", - "exact_location" : "The Chinese University of Hong Kong.", - "location" : "Hong Kong, Taiwan, China, and South East Asia", - "stratum" : "2", - "synchronization" : "NTP V3 secondary (stratum 2), i686/Linux", - ], - $[ "access_policy" : "open access, glad to receive a note", "address" : "os.ntp.carnet.hr", "country" : "HR", @@ -344,22 +300,6 @@ "synchronization" : "NTPV4 secondary (stratum 2), Intel, FreeBSD 2.2", ], $[ - "address" : "ntps.net4u.it", - "country" : "IT", - "exact_location" : "4u Srl, Vercelli, Italy", - "stratum" : "2", - "synchronization" : "NTP secondary (stratum 2), Linux 2 on Intel PIII 500MHz", - ], - $[ - "access_policy" : "open access", - "address" : "ntp.doubleukay.com", - "country" : "MY", - "exact_location" : "Cyberjaya, Malaysia", - "location" : "Malaysia", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), Intel/Linux", - ], - $[ "access_policy" : "open access", "address" : "fartein.ifi.uio.no", "coordinates" : "59:56:32N, 10:43:22E", @@ -485,7 +425,7 @@ $[ "access_policy" : "open access", "address" : "a.ntp.alphazed.net", - "country" : "UK", + "country" : "GB", "exact_location" : "Telehouse, London E14", "location" : "all areas", "stratum" : "2", @@ -501,18 +441,10 @@ "synchronization" : "NTP V4 Secondary (stratum 2), Sun SPARC10/Solaris,", ], $[ - "access_policy" : "Open Access", - "address" : "bear.zoo.bt.co.uk", - "country" : "UK", - "exact_location" : "BT Adastral Park, Ipswich, England", - "location" : "UK", - "stratum" : "2", - ], - $[ "access_policy" : "open access", "address" : "ntp.cis.strath.ac.uk", "coordinates" : "04:14W, 55:52N", - "country" : "UK", + "country" : "GB", "exact_location" : "Dept. Computer and Information Sciences, University of Strathclyde, Glasgow, Scotland.", "location" : "UK/Europe", "stratum" : "2", @@ -521,49 +453,49 @@ $[ "access_policy" : "Open Access", "address" : "ntp2a.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), Sun/SunOS", ], $[ "access_policy" : "Open Access", "address" : "ntp2b.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), PC/FreeBSD", ], $[ "access_policy" : "Open Access", "address" : "ntp2c.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), PC/FreeBSD", ], $[ "access_policy" : "Open Access", "address" : "ntp2d.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), SGI/Irix", ], $[ "address" : "ntp", - "country" : "UK", + "country" : "GB", "exact_location" : "Telehouse Europe, London E14.Geographic Coordinates: 51°30.71'N 0°00.08'W", "stratum" : "2", ], $[ "access_policy" : "Semi-open access. These are primarily for use by UUNET customers who may use them without asking, but others are welcome to peer if they give notice.", "address" : "ntp0.uk.uu.net", - "country" : "UK", + "country" : "GB", "exact_location" : "Cambridge, UK", "location" : "UUNET (formerly known in the UK as PIPEX); UK", "stratum" : "2", @@ -571,7 +503,7 @@ $[ "access_policy" : "Semi-open access. These are primarily for use by UUNET customers who may use them without asking, but others are welcome to peer if they give notice.", "address" : "ntp1.uk.uu.net", - "country" : "UK", + "country" : "GB", "exact_location" : "Cambridge, UK", "location" : "UUNET (formerly known in the UK as PIPEX); UK", "stratum" : "2", @@ -579,7 +511,7 @@ $[ "access_policy" : "Semi-open access. These are primarily for use by UUNET customers who may use them without asking, but others are welcome to peer if they give notice.", "address" : "ntp2.uk.uu.net", - "country" : "UK", + "country" : "GB", "exact_location" : "London, UK", "location" : "UUNET (formerly known in the UK as PIPEX); UK", "stratum" : "2", @@ -615,17 +547,6 @@ "synchronization" : "NTP secondary (stratum 2)", ], $[ - "access_policy" : "Open Access, please drop us a note so we can add you to our mailing list.", - "address" : "ntp1.mainecoon.com", - "coordinates" : "39:56.863N, 120:54.657W", - "country" : "US", - "exact_location" : "Quincy, California", - "location" : "North America", - "state" : "CA ", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2) P-II/X86 Solaris 2.7", - ], - $[ "access_policy" : "open access, please send a message to notify", "address" : "ntp1.sf-bay.org", "country" : "US", @@ -781,16 +702,6 @@ "synchronization" : "NTP V3 secondary (stratum 2), Linux on Intel", ], $[ - "access_policy" : "open access", - "address" : "ntp.ourconcord.net", - "country" : "US", - "exact_location" : "Concord, MA", - "location" : "Eastern time zone", - "state" : "MA ", - "stratum" : "2", - "synchronization" : "NTP v4 stratum 2, Linux", - ], - $[ "access_policy" : "open access, please send a message to notify.", "address" : "ns.nts.umn.edu", "country" : "US", @@ -914,17 +825,6 @@ "synchronization" : "NTP secondary (stratum 2), Sun/Unix", ], $[ - "access_policy" : "open access", - "address" : "reva.sixgirls.org", - "coordinates" : "40:42:20N, 74:0:40W", - "country" : "US", - "exact_location" : "The NYITC Building, 55 Broad Street, New York City, NY", - "location" : "New York, New Jersey, Connecticut, Long Island areas", - "state" : "NY ", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), m68k/NetBSD", - ], - $[ "access_policy" : "open access; please use name rather than address.", "address" : "sundial.columbia.edu", "country" : "US", @@ -1106,31 +1006,6 @@ "synchronization" : "NTP V4 secondary Solaris 2.7", ], $[ - "address" : "ntp.cs.unp.ac.za", - "country" : "ZA", - "exact_location" : "Natal University, Pietermaritzburg, South Africa", - "stratum" : "2", - "synchronization" : "NTP V3 secondary (stratum 2), SGI Indy/Irix6.2", - ], - $[ - "access_policy" : "open access", - "address" : "tock.nml.csir.co.za", - "coordinates" : "25,7461 S 28,2770 E (WGS-84)", - "country" : "ZA", - "exact_location" : "Pretoria, South Africa", - "location" : "Southern Africa", - "stratum" : "2", - "synchronization" : "NTP secondary (stratum 2), i386/FreeBSD", - ], - $[ - "address" : "ntp0.coreng.com.au", - "coordinates" : "33:50S 151:09E", - "country" : "AU", - "exact_location" : "Corinthian Engineering P/L, Sydney Australia.", - "stratum" : "1", - "synchronization" : "NTP V4 primary (Trimble Acutime GPS+PPS), i386/FreeBSD 4-STABLE.", - ], - $[ "address" : "ntp0.cs.mu.OZ.AU", "coordinates" : "37:48:09.60S 144:57:29.50E", "country" : "AU", @@ -1158,26 +1033,6 @@ "synchronization" : "NTP V4 Primary (GPS clock), PC/FreeBSD", ], $[ - "access_policy" : "open access, prior arrangment required", - "address" : "tick.usask.ca", - "coordinates" : "52:08:01N,106:38:11W", - "country" : "CA", - "exact_location" : "University oc Saskatchewan, Saskatoon, Saskatchewan, SK, Canada", - "location" : "SASK#net, CA*net, Canada", - "stratum" : "1", - "synchronization" : "NTP V3 Primary (GOES clock), DEC Mips/Unix", - ], - $[ - "access_policy" : "open access, prior arrangment required", - "address" : "tock.usask.ca", - "coordinates" : "52:08:01N,106:38:11W", - "country" : "CA", - "exact_location" : "University oc Saskatchewan, Saskatoon, Saskatchewan, SK, Canada", - "location" : "SASK#net, CA*net, Canada", - "stratum" : "1", - "synchronization" : "NTP V3 Primary (GOES clock), DEC Mips/Unix", - ], - $[ "access_policy" : "open access, please send a message to notify", "address" : "ntp.metas.ch", "coordinates" : "N 46:55:25 E 07:27:51", @@ -1288,27 +1143,6 @@ "synchronization" : "NTP V3 primary (GPS), PC/Linux", ], $[ - "address" : "ntp1.curie.fr", - "country" : "FR", - "exact_location" : "Institut Curie, Section de Recherche, Paris, France.", - "stratum" : "1", - "synchronization" : "Coetanian TSS100 NTP V3 GPS", - ], - $[ - "address" : "ntp2.curie.fr", - "country" : "FR", - "exact_location" : "Institut Curie, Section de Recherche, Paris, France.", - "stratum" : "1", - "synchronization" : "Datum 2100L NTP V3 GPS", - ], - $[ - "address" : "ntp3.curie.fr", - "country" : "FR", - "exact_location" : "Institut Curie, Section de Recherche, Paris, France.", - "stratum" : "1", - "synchronization" : "Truetime NTS100 GPS", - ], - $[ "access_policy" : "open access, please send a message to notify", "address" : "ntp-galway.hea.net", "country" : "IE", @@ -1527,7 +1361,7 @@ $[ "access_policy" : "closed access, see notes below.", "address" : "ntp2.ja.net", - "country" : "UK", + "country" : "GB", "exact_location" : "University of London Computer Centre, UK", "location" : "JANET", "stratum" : "1", @@ -1613,17 +1447,6 @@ "synchronization" : "NTP V3 primary GPS Clock", ], $[ - "access_policy" : "Open to stratum 2 servers for 10 or more hosts, others upon request", - "address" : "tick.gpsclock.com", - "coordinates" : "33:50:26.510N, 118:22:55.245W", - "country" : "US", - "exact_location" : "GPSClock.com headquarters, Redondo Beach, CA", - "location" : "US Pacific, Los Angeles area", - "state" : "CA ", - "stratum" : "1", - "synchronization" : "NTP V4 primary, GPSClock 300 hard PPS, FreeBSD", - ], - $[ "address" : "tick.ucla.edu", "country" : "US", "exact_location" : "UCLA, Los Angeles, CA", @@ -1732,17 +1555,6 @@ ], $[ "access_policy" : "closed access, except for stratum-2 servers providing synchronization to local networks of ten or more hosts", - "address" : "ntp1.nss.udel.edu", - "coordinates" : "39:40:35.8N, 75:44:36.6W (GPS WGS 84)", - "country" : "US", - "exact_location" : "University of Delaware, Newark, DE", - "location" : "BBN Planet SER", - "state" : "DE ", - "stratum" : "1", - "synchronization" : "NTP V3 Primary (GPS clock), TrueTime NTS-100-GPS", - ], - $[ - "access_policy" : "closed access, except for stratum-2 servers providing synchronization to local networks of ten or more hosts", "address" : "rackety.udel.edu", "coordinates" : "39:40:48.425N, 75:45:02.392W (GPS WGS84)", "country" : "US", @@ -1801,16 +1613,6 @@ "synchronization" : "NTP V3 primary (Brandywine Syncclock32/Oncore GPS)", ], $[ - "access_policy" : "closed access except for peers that meet the three conditions outlined in the "Time Servers" section of this file. State agreement with those conditions in notification message. All others may use the ntp-{0,1,2}.cso.uiuc.edu stratum 2 servers.", - "address" : "truechimer.cso.uiuc.edu", - "country" : "US", - "exact_location" : "University of Illinois, Urbana-Champaign, IL", - "location" : "CICNET, Midwest, NCSA region", - "state" : "IL ", - "stratum" : "1", - "synchronization" : "NTP V3 primary (WWVB clock), IBM-RS6000/250", - ], - $[ "access_policy" : "open access to significant stratum 2 servers in the service areas.", "address" : "tick.cerias.purdue.edu", "coordinates" : "40:25:33.2N, 86:54:54.7W (GPS)", @@ -1851,16 +1653,6 @@ "synchronization" : "NTP V4 primary, Motorola Oncore VP GPS, Linux", ], $[ - "access_policy" : "open access to stratum-2 servers and to MIT clients", - "address" : "tick.mit.edu", - "country" : "US", - "exact_location" : "Massachusetts Institute of Technology, Cambridge, MA", - "location" : "eastern time zone, others on request", - "state" : "MA ", - "stratum" : "1", - "synchronization" : "NTP V3 primary (GPS) HP9000/747i", - ], - $[ "access_policy" : "open access", "address" : "time.keneli.org", "country" : "US", @@ -1901,15 +1693,6 @@ "synchronization" : "NTP V3 primary (GPS) HP9000/747i", ], $[ - "access_policy" : "NC-REN region, other use by prior arrangement", - "address" : "ncnoc.ncren.net", - "country" : "US", - "exact_location" : "MCNC, Research Triangle Park, NC", - "state" : "NC ", - "stratum" : "1", - "synchronization" : "NTP V3 primary (WWVB clock), Netclock/2, Sun 4/65", - ], - $[ "access_policy" : "Closed access, except for stratum-2 servers providing synchronization to local networks of ten or more hosts; others by arrangement only. Please send a message to notify.", "address" : "ntp0.jensenresearch.com", "coordinates" : "41 00.975 N, 74 15.262 W Synchronization: NTP V4 primary; Præcis Ct CDMA clock; Intel PIII/866 Win2K", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62800 - /tags/branch-SLE-10-SP4-2_13_190/packager/
by jsrain＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: jsrain Date: Wed Nov 10 10:54:45 2010 New Revision: 62800 URL: http://svn.opensuse.org/viewcvs/yast?rev=62800&view=rev Log: Created tag branch-SLE-10-SP4-2_13_190 for packager Added: tags/branch-SLE-10-SP4-2_13_190/packager/ (props changed) - copied from r62799, branches/SuSE-SLE-10-SP4-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62799 - /tags/branch-SLE-10-SP4-2_13_190/
by jsrain＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: jsrain Date: Wed Nov 10 10:54:43 2010 New Revision: 62799 URL: http://svn.opensuse.org/viewcvs/yast?rev=62799&view=rev Log: Created tag branch-SLE-10-SP4-2_13_190 Added: tags/branch-SLE-10-SP4-2_13_190/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62798 - in /branches/SuSE-SLE-10-SP4-Branch/packager: VERSION package/yast2-packager.changes src/clients/inst_kickoff.ycp
by jsrain＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: jsrain Date: Wed Nov 10 10:52:41 2010 New Revision: 62798 URL: http://svn.opensuse.org/viewcvs/yast?rev=62798&view=rev Log: add virtio drivers to initrd if needed (bnc#649755) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Wed Nov 10 10:52:41 2010 @@ -1 +1 @@ -2.13.189 +2.13.190 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes Wed Nov 10 10:52:41 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 10 10:50:57 CET 2010 - jsrain(a)suse.cz + +- add virtio drivers to initrd if needed (bnc#649755) +- 2.13.190 + +------------------------------------------------------------------- Tue Nov 9 13:50:17 CET 2010 - jsrain(a)suse.cz - detect HyperV according to lscpu (bnc#652305) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Wed Nov 10 10:52:41 2010 @@ -80,6 +80,33 @@ } } +void AddVirtIOToInitrd() { + map<string, map<string, list<string> > > modules_db = $[ + "1af4" : $[ + "1000" : ["virtio-pci", "virtio-net"], + "1001" : ["virtio-pci", "virtio-blk"], + "1002" : ["virtio-pci", "virtio-balloon"], + "1003" : ["virtio-pci", "virtio-console"], + ], + ]; + + map out = (map)SCR::Execute (.target.bash_output, "LANG=C /sbin/lspci -mm -n"); + list<string> devices = splitstring (out["stdout"]:"", "\n"); + foreach (string d, devices, { + if (! regexpmatch (d, "^[0-9a-zA-Z.:]+[ \t]+\"[0-9a-fA-F]+\"[ \t]+\"[0-9a-fA-F]+\".*$")) { + continue; + } + string vendor = regexpsub (d, "^[0-9a-zA-Z.:]+[ \t]+\"([0-9a-fA-F]+)\"[ \t]+\"([0-9a-fA-F]+)\".*$", "\\2"); + string device = regexpsub (d, "^[0-9a-zA-Z.:]+[ \t]+\"([0-9a-fA-F]+)\"[ \t]+\"([0-9a-fA-F]+)\".*$", "\\1"); + foreach (string m, modules_db[vendor, device]:[], { + Initrd::AddModule (m, ""); + }); + }); +} + + + + /** * Write a fake mtab to the target system since some %post scripts might @@ -441,6 +468,7 @@ // add Xen and HyperV PV drivers to initrd XenPVToInitrd(); HyperVPVToInitrd(); + AddVirtIOToInitrd(); if (Stage::initial ()) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62797 - /tags/branch-SLE-10-SP4-2_13_15/slp-server/
by mzugec＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: mzugec Date: Wed Nov 10 10:37:06 2010 New Revision: 62797 URL: http://svn.opensuse.org/viewcvs/yast?rev=62797&view=rev Log: Created tag branch-SLE-10-SP4-2_13_15 for slp-server Added: tags/branch-SLE-10-SP4-2_13_15/slp-server/ - copied from r62796, branches/SuSE-SLE-10-SP4-Branch/slp-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62796 - /tags/branch-SLE-10-SP4-2_13_15/
by mzugec＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: mzugec Date: Wed Nov 10 10:37:02 2010 New Revision: 62796 URL: http://svn.opensuse.org/viewcvs/yast?rev=62796&view=rev Log: Created tag branch-SLE-10-SP4-2_13_15 Added: tags/branch-SLE-10-SP4-2_13_15/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62795 - in /branches/SuSE-SLE-10-SP4-Branch/slp-server: VERSION agents/slp_conf.scr package/yast2-slp-server.changes src/SlpServer.ycp src/dialogs.ycp
by mzugec＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: mzugec Date: Wed Nov 10 10:36:56 2010 New Revision: 62795 URL: http://svn.opensuse.org/viewcvs/yast?rev=62795&view=rev Log: store case-sensitive configuration options (bnc#291301) Modified: branches/SuSE-SLE-10-SP4-Branch/slp-server/VERSION branches/SuSE-SLE-10-SP4-Branch/slp-server/agents/slp_conf.scr branches/SuSE-SLE-10-SP4-Branch/slp-server/package/yast2-slp-server.changes branches/SuSE-SLE-10-SP4-Branch/slp-server/src/SlpServer.ycp branches/SuSE-SLE-10-SP4-Branch/slp-server/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/slp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/slp-se… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/slp-server/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/slp-server/VERSION Wed Nov 10 10:36:56 2010 @@ -1 +1 @@ -2.13.14 +2.13.15 Modified: branches/SuSE-SLE-10-SP4-Branch/slp-server/agents/slp_conf.scr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/slp-se… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/slp-server/agents/slp_conf.scr (original) +++ branches/SuSE-SLE-10-SP4-Branch/slp-server/agents/slp_conf.scr Wed Nov 10 10:36:56 2010 @@ -14,7 +14,7 @@ `ag_ini( `IniAgent( "/etc/slp.conf", $[ - "options" : [ "global_values", "comments_last", "ignore_case", "line_can_continue", "join_multiline" ], + "options" : [ "global_values", "comments_last", "line_can_continue", "join_multiline" ], "comments": [ "^[ \t]*$", // empty line "^[ \t]+[;#].*$", // comment char is not first char Modified: branches/SuSE-SLE-10-SP4-Branch/slp-server/package/yast2-slp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/slp-se… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/slp-server/package/yast2-slp-server.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/slp-server/package/yast2-slp-server.changes Wed Nov 10 10:36:56 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 10 10:29:43 CET 2010 - mzugec(a)suse.de + +- store case-sensitive configuration options (bnc#291301) +- 2.13.15 + +------------------------------------------------------------------- Thu May 21 10:17:16 CEST 2009 - mzugec(a)suse.cz - accept both IP and hostname in configuration (bnc#501941) Modified: branches/SuSE-SLE-10-SP4-Branch/slp-server/src/SlpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/slp-se… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/slp-server/src/SlpServer.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/slp-server/src/SlpServer.ycp Wed Nov 10 10:36:56 2010 @@ -95,10 +95,10 @@ map <string, any> SETTINGS = $[]; global map<string, any> slp_config = $[ - "net.slp.usescopes":"DEFAULT", - "net.slp.isda":"false", - "net.slp.isbroadcastonly":"false", - "net.slp.daheartbeat":nil + "net.slp.useScopes":"DEFAULT", + "net.slp.isDA":"false", + "net.slp.isBroadcastOnly":"false", + "net.slp.DAHeartBeat":nil ]; @@ -113,7 +113,7 @@ foreach(string k1, any v1, SETTINGS, { if (k1 == "value") { foreach(map<string, any > v2, (list < map<string, any> >)v1, { - if (v2["type"]:nil == 1) slp_config[tolower(v2["name"]:"") ]=v2["value"]:""; + if (v2["type"]:nil == 1) slp_config[v2["name"]:""]=v2["value"]:""; }); } }); @@ -125,59 +125,36 @@ // write global configuration file /etc/slp.conf boolean WriteGlobalConfig(){ - list<string> correct_case2 = [ -"net.slp.useScopes", -"net.slp.DAAddresses", -"net.slp.isDA", -"net.slp.DAHeartBeat", -"net.slp.watchRegistrationPID", -"net.slp.maxResults", -"net.slp.isBroadcastOnly", -"net.slp.passiveDADetection", -"net.slp.activeDADetection", -"net.slp.DAActiveDiscoveryInterval", -"net.slp.multicastTTL", -"net.slp.DADiscoveryMaximumWait", -"net.slp.DADiscoveryTimeouts", -"net.slp.multicastMaximumWait", -"net.slp.multicastTimeouts", -"net.slp.unicastMaximumWait", -"net.slp.unicastTimeouts", -"net.slp.datagramTimeouts", -"net.slp.randomWaitBound", -"net.slp.MTU", -"net.slp.interfaces", -"net.slp.securityEnabled", -"net.slp.checkSourceAddr", -"net.slp.traceDATraffic", -"net.slp.traceReg", -"net.slp.traceDrop", -"net.slp.traceMsg" -]; + foreach(string k1, any v1, slp_config, { - SETTINGS["value"] = maplist(map<string, any > v2, (list < map<string, any> >) SETTINGS["value"]:nil, { + boolean found=false; + SETTINGS["value"] = maplist(map<string, any > v2, (list < map<string, any> >) SETTINGS["value"]:[], { if (k1 == v2["name"]:"") { - if (v1 == nil) v2["type"]=0; - else { - foreach(string s, correct_case2, { - if (tolower(s)==k1){ - v2["name"] = s; - break; - } - }); - v2["type"]=1; - v2["value"]=v1; - } + v2["type"]= (v1 == nil) ? 0 : 1; + v2["value"]=v1; + found=true; } return v2; }); + if (!found) SETTINGS["value"]=add(SETTINGS["value"]:[], + $[ + "name" : k1, + "type" : (v1 == nil) ? 0 : 1, + "kind" : "value", + "comment":"", + "value": v1 + ] + ); }); + y2milestone("slp_config %1", slp_config); + y2milestone("SETTINGS %1", SETTINGS); + REGFILES["value"] = reg_files; - y2milestone("write reg_files %1", reg_files); - y2milestone("write REGFILES %1", REGFILES); + y2debug("write reg_files %1", reg_files); + y2debug("write REGFILES %1", REGFILES); SCR::Write(.etc.slp.all, SETTINGS); SCR::Write(.etc.slp.reg.all, REGFILES); Modified: branches/SuSE-SLE-10-SP4-Branch/slp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/slp-se… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/slp-server/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/slp-server/src/dialogs.ycp Wed Nov 10 10:36:56 2010 @@ -240,33 +240,33 @@ define map getServerOptions() ``{ return $[ - "net.slp.usescopes":$[], - "net.slp.daaddresses":$[], - "net.slp.isda":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.daheartbeat":$[], - "net.slp.watchregistrationpid":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.maxresults":$[], - "net.slp.isbroadcastonly":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.passivedadetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.activedadetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.daactivediscoveryinterval":$[], - "net.slp.multicastttl":$[], - "net.slp.dadiscoverymaximumwait":$[], - "net.slp.dadiscoverytimeouts":$[], - "net.slp.multicastmaximumwait":$[], - "net.slp.multicasttimeouts":$[], - "net.slp.unicastmaximumwait":$[], - "net.slp.unicasttimeouts":$[], - "net.slp.datagramtimeouts":$[], - "net.slp.randomWaitbound":$[], - "net.slp.mtu":$[], + "net.slp.useScopes":$[], + "net.slp.DAAddresses":$[], + "net.slp.isDA":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.DAHeartBeat":$[], + "net.slp.watchRegistrationPID":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.maxResults":$[], + "net.slp.isBroadcastOnly":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.passiveDADetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.activeDADetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.DAActiveDiscoveryInterval":$[], + "net.slp.multicastTTL":$[], + "net.slp.DADiscoveryMaximumWait":$[], + "net.slp.DADiscoveryTimeouts":$[], + "net.slp.multicastMaximumWait":$[], + "net.slp.multicastTimeouts":$[], + "net.slp.unicastMaximumWait":$[], + "net.slp.unicastTimeouts":$[], + "net.slp.datagramTimeouts":$[], + "net.slp.randomWaitBound":$[], + "net.slp.MTU":$[], "net.slp.interfaces":$[], - "net.slp.securityenabled":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.checksourceaddr":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracedatraffic":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracereg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracedrop":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracemsg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]] + "net.slp.securityEnabled":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.checkSourceAddr":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceDATraffic":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceReg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceDrop":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceMsg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]] ]; } @@ -523,24 +523,24 @@ case(`bc) : y2milestone("Use broadcast"); UI::ChangeWidget(`id(`ip), `Enabled, false); UI::ChangeWidget(`id(`scope), `Enabled, false); - SlpServer::slp_config["net.slp.isda"]="false"; - SlpServer::slp_config["net.slp.isbroadcastonly"]="true"; + SlpServer::slp_config["net.slp.isDA"]="false"; + SlpServer::slp_config["net.slp.isBroadcastOnly"]="true"; break; case(`mc) : y2milestone("Use multicast"); UI::ChangeWidget(`id(`ip), `Enabled, false); UI::ChangeWidget(`id(`scope), `Enabled, true); - SlpServer::slp_config["net.slp.isda"]="false"; - SlpServer::slp_config["net.slp.isbroadcastonly"]="false"; + SlpServer::slp_config["net.slp.isDA"]="false"; + SlpServer::slp_config["net.slp.isBroadcastOnly"]="false"; break; case(`da) : y2milestone("Use DA Server"); UI::ChangeWidget(`id(`ip), `Enabled, true); UI::ChangeWidget(`id(`scope), `Enabled, true); - SlpServer::slp_config["net.slp.isda"]="false"; + SlpServer::slp_config["net.slp.isDA"]="false"; break; case(`da_server) : y2milestone("Becomes DA Server"); UI::ChangeWidget(`id(`ip), `Enabled, false); // UI::ChangeWidget(`id(`scope), `Enabled, false); - SlpServer::slp_config["net.slp.isda"]="true"; + SlpServer::slp_config["net.slp.isDA"]="true"; break; } @@ -550,13 +550,13 @@ define void initServerSettings(string key) ``{ symbol mode = nil; keys = []; - UI::ChangeWidget(`id(`ip), `Value, String::CutBlanks( SlpServer::slp_config["net.slp.daaddresses"]:"") ); - UI::ChangeWidget(`id(`scope), `Value, SlpServer::slp_config["net.slp.usescopes"]:""); - if (SlpServer::slp_config["net.slp.isda"]:"false" == "true") mode = `da_server; + UI::ChangeWidget(`id(`ip), `Value, String::CutBlanks( SlpServer::slp_config["net.slp.DAAddresses"]:"") ); + UI::ChangeWidget(`id(`scope), `Value, SlpServer::slp_config["net.slp.useScopes"]:""); + if (SlpServer::slp_config["net.slp.isDA"]:"false" == "true") mode = `da_server; else - if (SlpServer::slp_config["net.slp.isbroadcastonly"]:"false" == "true") mode = `bc; + if (SlpServer::slp_config["net.slp.isBroadcastOnly"]:"false" == "true") mode = `bc; else - if (size(deletechars(SlpServer::slp_config["net.slp.daaddresses"]:"", " "))>0) mode = `da; + if (size(deletechars(SlpServer::slp_config["net.slp.DAAddresses"]:"", " "))>0) mode = `da; else mode = `mc; UI::ChangeWidget(`id(`resp), `CurrentButton, mode); changeResponseTo(mode); @@ -571,8 +571,8 @@ } void storeServerSettings(string option_id, map option_map) ``{ - SlpServer::slp_config["net.slp.usescopes"]=UI::QueryWidget(`id(`scope), `Value); - SlpServer::slp_config["net.slp.daaddresses"]=UI::QueryWidget(`id(`ip), `Value); + SlpServer::slp_config["net.slp.useScopes"]=UI::QueryWidget(`id(`scope), `Value); + SlpServer::slp_config["net.slp.DAAddresses"]=UI::QueryWidget(`id(`ip), `Value); }; define boolean validateServerSettings (string key, map event) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62794 - /tags/branch-SLE-10-SP3-2_13_15/slp-server/
by mzugec＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: mzugec Date: Wed Nov 10 10:29:23 2010 New Revision: 62794 URL: http://svn.opensuse.org/viewcvs/yast?rev=62794&view=rev Log: Created tag branch-SLE-10-SP3-2_13_15 for slp-server Added: tags/branch-SLE-10-SP3-2_13_15/slp-server/ - copied from r62793, branches/SuSE-SLE-10-SP3-Branch/slp-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62793 - /tags/branch-SLE-10-SP3-2_13_15/
by mzugec＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: mzugec Date: Wed Nov 10 10:29:20 2010 New Revision: 62793 URL: http://svn.opensuse.org/viewcvs/yast?rev=62793&view=rev Log: Created tag branch-SLE-10-SP3-2_13_15 Added: tags/branch-SLE-10-SP3-2_13_15/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62792 - in /branches/SuSE-SLE-10-SP3-Branch/slp-server: VERSION agents/slp_conf.scr package/yast2-slp-server.changes src/SlpServer.ycp src/dialogs.ycp
by mzugec＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: mzugec Date: Wed Nov 10 10:29:12 2010 New Revision: 62792 URL: http://svn.opensuse.org/viewcvs/yast?rev=62792&view=rev Log: MU: store case-sensitive configuration options (bnc#291301) Modified: branches/SuSE-SLE-10-SP3-Branch/slp-server/VERSION branches/SuSE-SLE-10-SP3-Branch/slp-server/agents/slp_conf.scr branches/SuSE-SLE-10-SP3-Branch/slp-server/package/yast2-slp-server.changes branches/SuSE-SLE-10-SP3-Branch/slp-server/src/SlpServer.ycp branches/SuSE-SLE-10-SP3-Branch/slp-server/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/slp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/slp-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/slp-server/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/slp-server/VERSION Wed Nov 10 10:29:12 2010 @@ -1 +1 @@ -2.13.14 +2.13.15 Modified: branches/SuSE-SLE-10-SP3-Branch/slp-server/agents/slp_conf.scr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/slp-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/slp-server/agents/slp_conf.scr (original) +++ branches/SuSE-SLE-10-SP3-Branch/slp-server/agents/slp_conf.scr Wed Nov 10 10:29:12 2010 @@ -14,7 +14,7 @@ `ag_ini( `IniAgent( "/etc/slp.conf", $[ - "options" : [ "global_values", "comments_last", "ignore_case", "line_can_continue", "join_multiline" ], + "options" : [ "global_values", "comments_last", "line_can_continue", "join_multiline" ], "comments": [ "^[ \t]*$", // empty line "^[ \t]+[;#].*$", // comment char is not first char Modified: branches/SuSE-SLE-10-SP3-Branch/slp-server/package/yast2-slp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/slp-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/slp-server/package/yast2-slp-server.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/slp-server/package/yast2-slp-server.changes Wed Nov 10 10:29:12 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 10 10:14:38 CET 2010 - mzugec(a)suse.de + +- MU: store case-sensitive configuration options (bnc#291301) +- 2.13.15 + +------------------------------------------------------------------- Thu May 21 10:17:16 CEST 2009 - mzugec(a)suse.cz - accept both IP and hostname in configuration (bnc#501941) Modified: branches/SuSE-SLE-10-SP3-Branch/slp-server/src/SlpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/slp-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/slp-server/src/SlpServer.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/slp-server/src/SlpServer.ycp Wed Nov 10 10:29:12 2010 @@ -95,10 +95,10 @@ map <string, any> SETTINGS = $[]; global map<string, any> slp_config = $[ - "net.slp.usescopes":"DEFAULT", - "net.slp.isda":"false", - "net.slp.isbroadcastonly":"false", - "net.slp.daheartbeat":nil + "net.slp.useScopes":"DEFAULT", + "net.slp.isDA":"false", + "net.slp.isBroadcastOnly":"false", + "net.slp.DAHeartBeat":nil ]; @@ -113,7 +113,7 @@ foreach(string k1, any v1, SETTINGS, { if (k1 == "value") { foreach(map<string, any > v2, (list < map<string, any> >)v1, { - if (v2["type"]:nil == 1) slp_config[tolower(v2["name"]:"") ]=v2["value"]:""; + if (v2["type"]:nil == 1) slp_config[v2["name"]:""]=v2["value"]:""; }); } }); @@ -125,59 +125,36 @@ // write global configuration file /etc/slp.conf boolean WriteGlobalConfig(){ - list<string> correct_case2 = [ -"net.slp.useScopes", -"net.slp.DAAddresses", -"net.slp.isDA", -"net.slp.DAHeartBeat", -"net.slp.watchRegistrationPID", -"net.slp.maxResults", -"net.slp.isBroadcastOnly", -"net.slp.passiveDADetection", -"net.slp.activeDADetection", -"net.slp.DAActiveDiscoveryInterval", -"net.slp.multicastTTL", -"net.slp.DADiscoveryMaximumWait", -"net.slp.DADiscoveryTimeouts", -"net.slp.multicastMaximumWait", -"net.slp.multicastTimeouts", -"net.slp.unicastMaximumWait", -"net.slp.unicastTimeouts", -"net.slp.datagramTimeouts", -"net.slp.randomWaitBound", -"net.slp.MTU", -"net.slp.interfaces", -"net.slp.securityEnabled", -"net.slp.checkSourceAddr", -"net.slp.traceDATraffic", -"net.slp.traceReg", -"net.slp.traceDrop", -"net.slp.traceMsg" -]; + foreach(string k1, any v1, slp_config, { - SETTINGS["value"] = maplist(map<string, any > v2, (list < map<string, any> >) SETTINGS["value"]:nil, { + boolean found=false; + SETTINGS["value"] = maplist(map<string, any > v2, (list < map<string, any> >) SETTINGS["value"]:[], { if (k1 == v2["name"]:"") { - if (v1 == nil) v2["type"]=0; - else { - foreach(string s, correct_case2, { - if (tolower(s)==k1){ - v2["name"] = s; - break; - } - }); - v2["type"]=1; - v2["value"]=v1; - } + v2["type"]= (v1 == nil) ? 0 : 1; + v2["value"]=v1; + found=true; } return v2; }); + if (!found) SETTINGS["value"]=add(SETTINGS["value"]:[], + $[ + "name" : k1, + "type" : (v1 == nil) ? 0 : 1, + "kind" : "value", + "comment":"", + "value": v1 + ] + ); }); + y2milestone("slp_config %1", slp_config); + y2milestone("SETTINGS %1", SETTINGS); + REGFILES["value"] = reg_files; - y2milestone("write reg_files %1", reg_files); - y2milestone("write REGFILES %1", REGFILES); + y2debug("write reg_files %1", reg_files); + y2debug("write REGFILES %1", REGFILES); SCR::Write(.etc.slp.all, SETTINGS); SCR::Write(.etc.slp.reg.all, REGFILES); Modified: branches/SuSE-SLE-10-SP3-Branch/slp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/slp-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/slp-server/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/slp-server/src/dialogs.ycp Wed Nov 10 10:29:12 2010 @@ -240,33 +240,33 @@ define map getServerOptions() ``{ return $[ - "net.slp.usescopes":$[], - "net.slp.daaddresses":$[], - "net.slp.isda":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.daheartbeat":$[], - "net.slp.watchregistrationpid":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.maxresults":$[], - "net.slp.isbroadcastonly":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.passivedadetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.activedadetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.daactivediscoveryinterval":$[], - "net.slp.multicastttl":$[], - "net.slp.dadiscoverymaximumwait":$[], - "net.slp.dadiscoverytimeouts":$[], - "net.slp.multicastmaximumwait":$[], - "net.slp.multicasttimeouts":$[], - "net.slp.unicastmaximumwait":$[], - "net.slp.unicasttimeouts":$[], - "net.slp.datagramtimeouts":$[], - "net.slp.randomWaitbound":$[], - "net.slp.mtu":$[], + "net.slp.useScopes":$[], + "net.slp.DAAddresses":$[], + "net.slp.isDA":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.DAHeartBeat":$[], + "net.slp.watchRegistrationPID":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.maxResults":$[], + "net.slp.isBroadcastOnly":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.passiveDADetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.activeDADetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.DAActiveDiscoveryInterval":$[], + "net.slp.multicastTTL":$[], + "net.slp.DADiscoveryMaximumWait":$[], + "net.slp.DADiscoveryTimeouts":$[], + "net.slp.multicastMaximumWait":$[], + "net.slp.multicastTimeouts":$[], + "net.slp.unicastMaximumWait":$[], + "net.slp.unicastTimeouts":$[], + "net.slp.datagramTimeouts":$[], + "net.slp.randomWaitBound":$[], + "net.slp.MTU":$[], "net.slp.interfaces":$[], - "net.slp.securityenabled":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.checksourceaddr":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracedatraffic":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracereg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracedrop":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracemsg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]] + "net.slp.securityEnabled":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.checkSourceAddr":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceDATraffic":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceReg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceDrop":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceMsg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]] ]; } @@ -523,24 +523,24 @@ case(`bc) : y2milestone("Use broadcast"); UI::ChangeWidget(`id(`ip), `Enabled, false); UI::ChangeWidget(`id(`scope), `Enabled, false); - SlpServer::slp_config["net.slp.isda"]="false"; - SlpServer::slp_config["net.slp.isbroadcastonly"]="true"; + SlpServer::slp_config["net.slp.isDA"]="false"; + SlpServer::slp_config["net.slp.isBroadcastOnly"]="true"; break; case(`mc) : y2milestone("Use multicast"); UI::ChangeWidget(`id(`ip), `Enabled, false); UI::ChangeWidget(`id(`scope), `Enabled, true); - SlpServer::slp_config["net.slp.isda"]="false"; - SlpServer::slp_config["net.slp.isbroadcastonly"]="false"; + SlpServer::slp_config["net.slp.isDA"]="false"; + SlpServer::slp_config["net.slp.isBroadcastOnly"]="false"; break; case(`da) : y2milestone("Use DA Server"); UI::ChangeWidget(`id(`ip), `Enabled, true); UI::ChangeWidget(`id(`scope), `Enabled, true); - SlpServer::slp_config["net.slp.isda"]="false"; + SlpServer::slp_config["net.slp.isDA"]="false"; break; case(`da_server) : y2milestone("Becomes DA Server"); UI::ChangeWidget(`id(`ip), `Enabled, false); // UI::ChangeWidget(`id(`scope), `Enabled, false); - SlpServer::slp_config["net.slp.isda"]="true"; + SlpServer::slp_config["net.slp.isDA"]="true"; break; } @@ -550,13 +550,13 @@ define void initServerSettings(string key) ``{ symbol mode = nil; keys = []; - UI::ChangeWidget(`id(`ip), `Value, String::CutBlanks( SlpServer::slp_config["net.slp.daaddresses"]:"") ); - UI::ChangeWidget(`id(`scope), `Value, SlpServer::slp_config["net.slp.usescopes"]:""); - if (SlpServer::slp_config["net.slp.isda"]:"false" == "true") mode = `da_server; + UI::ChangeWidget(`id(`ip), `Value, String::CutBlanks( SlpServer::slp_config["net.slp.DAAddresses"]:"") ); + UI::ChangeWidget(`id(`scope), `Value, SlpServer::slp_config["net.slp.useScopes"]:""); + if (SlpServer::slp_config["net.slp.isDA"]:"false" == "true") mode = `da_server; else - if (SlpServer::slp_config["net.slp.isbroadcastonly"]:"false" == "true") mode = `bc; + if (SlpServer::slp_config["net.slp.isBroadcastOnly"]:"false" == "true") mode = `bc; else - if (size(deletechars(SlpServer::slp_config["net.slp.daaddresses"]:"", " "))>0) mode = `da; + if (size(deletechars(SlpServer::slp_config["net.slp.DAAddresses"]:"", " "))>0) mode = `da; else mode = `mc; UI::ChangeWidget(`id(`resp), `CurrentButton, mode); changeResponseTo(mode); @@ -571,8 +571,8 @@ } void storeServerSettings(string option_id, map option_map) ``{ - SlpServer::slp_config["net.slp.usescopes"]=UI::QueryWidget(`id(`scope), `Value); - SlpServer::slp_config["net.slp.daaddresses"]=UI::QueryWidget(`id(`ip), `Value); + SlpServer::slp_config["net.slp.useScopes"]=UI::QueryWidget(`id(`scope), `Value); + SlpServer::slp_config["net.slp.DAAddresses"]=UI::QueryWidget(`id(`ip), `Value); }; define boolean validateServerSettings (string key, map event) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62791 - /tags/stable-2_20_5/country/
by jsuchome＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: jsuchome Date: Wed Nov 10 08:10:23 2010 New Revision: 62791 URL: http://svn.opensuse.org/viewcvs/yast?rev=62791&view=rev Log: Created tag stable-2_20_5 for country Added: tags/stable-2_20_5/country/ - copied from r62790, trunk/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62790 - in /trunk/country: VERSION package/yast2-country.changes timezone/src/Timezone.ycp
by jsuchome＠svn2.opensuse.org 10 Nov '10

10 Nov '10

Author: jsuchome Date: Wed Nov 10 08:10:15 2010 New Revision: 62790 URL: http://svn.opensuse.org/viewcvs/yast?rev=62790&view=rev Log: - fixed broken build - 2.20.5 Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/src/Timezone.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=62790&r1=627… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Wed Nov 10 08:10:15 2010 @@ -1 +1 @@ -2.20.4 +2.20.5 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Wed Nov 10 08:10:15 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 10 07:56:37 CET 2010 - jsuchome(a)suse.cz + +- fixed broken build +- 2.20.5 + +------------------------------------------------------------------- Tue Nov 9 15:19:22 CET 2010 - jsuchome(a)suse.cz - call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) Modified: trunk/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.yc… ============================================================================== --- trunk/country/timezone/src/Timezone.ycp (original) +++ trunk/country/timezone/src/Timezone.ycp Wed Nov 10 08:10:15 2010 @@ -380,14 +380,6 @@ return true; } -global boolean CallMkinitrd () { - - y2milestone ("calling mkinitrd..."); - SCR::Execute (.target.bash, "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>> /var/log/YaST2/y2logmkinitrd"); - y2milestone ("... done"); - return true; -} - /** * Set the new time and date given by user */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62789 - /tags/stable-2_20_0/slp-server/
by mzugec＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: mzugec Date: Tue Nov 9 16:27:08 2010 New Revision: 62789 URL: http://svn.opensuse.org/viewcvs/yast?rev=62789&view=rev Log: Created tag stable-2_20_0 for slp-server Added: tags/stable-2_20_0/slp-server/ - copied from r62788, trunk/slp-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62788 - in /trunk/slp-server: VERSION package/yast2-slp-server.changes src/SlpServer.ycp
by mzugec＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: mzugec Date: Tue Nov 9 16:26:58 2010 New Revision: 62788 URL: http://svn.opensuse.org/viewcvs/yast?rev=62788&view=rev Log: improved fix for bnc#291301 (write also values that wasn't readed) Modified: trunk/slp-server/VERSION trunk/slp-server/package/yast2-slp-server.changes trunk/slp-server/src/SlpServer.ycp Modified: trunk/slp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/VERSION?rev=62788&r1=… ============================================================================== --- trunk/slp-server/VERSION (original) +++ trunk/slp-server/VERSION Tue Nov 9 16:26:58 2010 @@ -1 +1 @@ -2.19.0 +2.20.0 Modified: trunk/slp-server/package/yast2-slp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/package/yast2-slp-ser… ============================================================================== --- trunk/slp-server/package/yast2-slp-server.changes (original) +++ trunk/slp-server/package/yast2-slp-server.changes Tue Nov 9 16:26:58 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 9 16:23:16 CET 2010 - mzugec(a)suse.cz + +- improved fix for bnc#291301 (write also values that wasn't readed) +- 2.20.0 + +------------------------------------------------------------------- Mon Jun 28 16:14:37 CEST 2010 - mzugec(a)suse.cz - parse config file case sensitive Modified: trunk/slp-server/src/SlpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/SlpServer.ycp?rev… ============================================================================== --- trunk/slp-server/src/SlpServer.ycp (original) +++ trunk/slp-server/src/SlpServer.ycp Tue Nov 9 16:26:58 2010 @@ -126,54 +126,36 @@ // write global configuration file /etc/slp.conf boolean WriteGlobalConfig(){ -/* - list<string> correct_case2 = [ -"net.slp.useScopes", -"net.slp.DAAddresses", -"net.slp.isDA", -"net.slp.DAHeartBeat", -"net.slp.watchRegistrationPID", -"net.slp.maxResults", -"net.slp.isBroadcastOnly", -"net.slp.passiveDADetection", -"net.slp.activeDADetection", -"net.slp.DAActiveDiscoveryInterval", -"net.slp.multicastTTL", -"net.slp.DADiscoveryMaximumWait", -"net.slp.DADiscoveryTimeouts", -"net.slp.multicastMaximumWait", -"net.slp.multicastTimeouts", -"net.slp.unicastMaximumWait", -"net.slp.unicastTimeouts", -"net.slp.datagramTimeouts", -"net.slp.randomWaitBound", -"net.slp.MTU", -"net.slp.interfaces", -"net.slp.securityEnabled", -"net.slp.checkSourceAddr", -"net.slp.traceDATraffic", -"net.slp.traceReg", -"net.slp.traceDrop", -"net.slp.traceMsg" -]; -*/ + foreach(string k1, any v1, slp_config, { - SETTINGS["value"] = maplist(map<string, any > v2, (list < map<string, any> >) SETTINGS["value"]:nil, { + boolean found=false; + SETTINGS["value"] = maplist(map<string, any > v2, (list < map<string, any> >) SETTINGS["value"]:[], { if (k1 == v2["name"]:"") { v2["type"]= (v1 == nil) ? 0 : 1; v2["value"]=v1; + found=true; } return v2; }); + if (!found) SETTINGS["value"]=add(SETTINGS["value"]:[], + $[ + "name" : k1, + "type" : (v1 == nil) ? 0 : 1, + "kind" : "value", + "comment":"", + "value": v1 + ] + ); }); -y2internal("slp_config %1", slp_config); + y2milestone("slp_config %1", slp_config); + y2milestone("SETTINGS %1", SETTINGS); REGFILES["value"] = reg_files; - y2milestone("write reg_files %1", reg_files); - y2milestone("write REGFILES %1", REGFILES); + y2debug("write reg_files %1", reg_files); + y2debug("write REGFILES %1", REGFILES); SCR::Write(.etc.slp.all, SETTINGS); SCR::Write(.etc.slp.reg.all, REGFILES); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62787 - in /branches/SuSE-Code-11-SP1-Branch/gtk: VERSION package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: rpmcruz Date: Tue Nov 9 16:08:43 2010 New Revision: 62787 URL: http://svn.opensuse.org/viewcvs/yast?rev=62787&view=rev Log: Updating changelog. Modified: branches/SuSE-Code-11-SP1-Branch/gtk/VERSION branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes Modified: branches/SuSE-Code-11-SP1-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/V… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/VERSION Tue Nov 9 16:08:43 2010 @@ -1 +1 @@ -2.17.16 +2.17.18 Modified: branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/p… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes Tue Nov 9 16:08:43 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 09 15:05:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- fix YTree crash on right-click (bnc#652047). +- Version 2.17.18 + +------------------------------------------------------------------- Fri Feb 23 16:03:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.17.17 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62786 - /tags/stable-2_20_4/country/
by jsuchome＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jsuchome Date: Tue Nov 9 15:49:06 2010 New Revision: 62786 URL: http://svn.opensuse.org/viewcvs/yast?rev=62786&view=rev Log: Created tag stable-2_20_4 for country Added: tags/stable-2_20_4/country/ - copied from r62785, trunk/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62785 - in /trunk/country: VERSION package/yast2-country.changes timezone/src/Timezone.ycp timezone/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jsuchome Date: Tue Nov 9 15:48:32 2010 New Revision: 62785 URL: http://svn.opensuse.org/viewcvs/yast?rev=62785&view=rev Log: - call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) - 2.20.4 Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/src/Timezone.ycp trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=62785&r1=627… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Tue Nov 9 15:48:32 2010 @@ -1 +1 @@ -2.20.3 +2.20.4 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Tue Nov 9 15:48:32 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 9 15:19:22 CET 2010 - jsuchome(a)suse.cz + +- call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) +- 2.20.4 + +------------------------------------------------------------------- Mon Nov 8 14:24:53 UTC 2010 - lslezak(a)suse.cz - don't install recommended packages for already installed packages Modified: trunk/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.yc… ============================================================================== --- trunk/country/timezone/src/Timezone.ycp (original) +++ trunk/country/timezone/src/Timezone.ycp Tue Nov 9 15:48:32 2010 @@ -59,6 +59,8 @@ */ global boolean windows_partition = false; +// if mkinitrd should be called at the end +global boolean call_mkinitrd = false; // translation of correct timezone to the one that could be shown in map widget global map <string,string> yast2zonetab = $[ @@ -378,6 +380,14 @@ return true; } +global boolean CallMkinitrd () { + + y2milestone ("calling mkinitrd..."); + SCR::Execute (.target.bash, "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>> /var/log/YaST2/y2logmkinitrd"); + y2milestone ("... done"); + return true; +} + /** * Set the new time and date given by user */ @@ -754,6 +764,11 @@ y2milestone( "Save Saved data for timezone: <%1>", timezone ); + if (call_mkinitrd && !Stage::initial ()) + { + CallMkinitrd (); + } + return; } Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp… ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Tue Nov 9 15:48:32 2010 @@ -392,10 +392,7 @@ if (Timezone::hwclock == "--localtime" && !Stage::initial ()) { - // busy message - Popup::ShowFeedback ("", _("Updating initrd...")); - Timezone::CallMkinitrd (); - Popup::ClearFeedback (); + Timezone::call_mkinitrd = true; } } } @@ -439,6 +436,7 @@ boolean changed_time = false; string timezone = Timezone::timezone; string timezone_old = timezone; + string timezone_initial = timezone; string hwclock = Timezone::hwclock; y2milestone ( "timezone_old %1", timezone_old ); @@ -875,6 +873,12 @@ Timezone::user_decision = true; Timezone::user_hwclock = true; Timezone::ntp_used = ntp_used; + // See bnc#638185c5: refresh_initrd should be called if HWCLOCK is changed (--localtime <-> --utc) and/or + // if --localtime is set and TIMEZONE will be changed. + if (hwclock_s != hwclock_s_initial || (hwclock_s == `hwclock_localtime && timezone != timezone_initial)) + { + Timezone::call_mkinitrd = true; + } if (ntp_used && ntp_server != "") { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62784 - in /trunk/sound: ./ data/
by lslezak＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: lslezak Date: Tue Nov 9 15:47:15 2010 New Revision: 62784 URL: http://svn.opensuse.org/viewcvs/yast?rev=62784&view=rev Log: updated svn:ignore - ignore libtool files, adapted to the new DB generator Modified: trunk/sound/ (props changed) trunk/sound/data/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62783 - /tags/branch-SLE-10-SP4-2_13_168/bootloader/
by jreidinger＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jreidinger Date: Tue Nov 9 15:24:36 2010 New Revision: 62783 URL: http://svn.opensuse.org/viewcvs/yast?rev=62783&view=rev Log: Created tag branch-SLE-10-SP4-2_13_168 for bootloader Added: tags/branch-SLE-10-SP4-2_13_168/bootloader/ - copied from r62782, branches/SuSE-SLE-10-SP4-Branch/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62782 - /tags/branch-SLE-10-SP4-2_13_168/
by jreidinger＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jreidinger Date: Tue Nov 9 15:24:33 2010 New Revision: 62782 URL: http://svn.opensuse.org/viewcvs/yast?rev=62782&view=rev Log: Created tag branch-SLE-10-SP4-2_13_168 Added: tags/branch-SLE-10-SP4-2_13_168/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62781 - in /branches/SuSE-SLE-10-SP4-Branch/bootloader: VERSION package/yast2-bootloader.changes src/routines/misc.ycp
by jreidinger＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jreidinger Date: Tue Nov 9 15:24:06 2010 New Revision: 62781 URL: http://svn.opensuse.org/viewcvs/yast?rev=62781&view=rev Log: modprobing hyperV module cause KVM crash, so return bakc to lscpu and add it to inst-sys Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION Tue Nov 9 15:24:06 2010 @@ -1 +1 @@ -2.13.167 +2.13.168 Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes Tue Nov 9 15:24:06 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 9 12:42:14 UTC 2010 - jreidinger(a)novell.com + +- switch back to lscpu as modprobing cause crash on KVM. lscpu are + going to be inside inst-sys. +- 2.13.168 + +------------------------------------------------------------------- Tue Nov 2 18:04:50 UTC 2010 - jreidinger(a)novell.com - Fix detection of HyperV as during install there is not lscpu Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp Tue Nov 9 15:24:06 2010 @@ -2010,8 +2010,8 @@ // check if it is HVM guest only if ((!Arch::is_xen()) && (xen == true)) ret = true; - integer hyperV = (integer)SCR::Execute(.target.bash, "/sbin/modprobe vmbus"); - if (hyperV == 0) //module can be loaded, so we are in HyperV (bnc#650780) + integer hyperV = (integer)SCR::Execute(.target.bash, "LANG=C lscpu | grep 'Hypervisor vendor:[[:space:]]*Microsoft' >/dev/null"); + if (hyperV == 0) //there is microsoft as hypervisor vendor (bnc#650780) ret = true; return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62780 - /tags/stable-2_20_0/sound/
by lslezak＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: lslezak Date: Tue Nov 9 15:08:09 2010 New Revision: 62780 URL: http://svn.opensuse.org/viewcvs/yast?rev=62780&view=rev Log: Created tag stable-2_20_0 for sound Added: tags/stable-2_20_0/sound/ (props changed) - copied from r62779, trunk/sound/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62779 - in /trunk/sound: ./ data/ data/addons/ data/doc/ data/include/ data/map_indent/ data/src/ package/
by lslezak＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: lslezak Date: Tue Nov 9 14:59:28 2010 New Revision: 62779 URL: http://svn.opensuse.org/viewcvs/yast?rev=62779&view=rev Log: - build the soundcard database during package build - use the existing ALSA drivers, the DB is always up to date and is architecture dependent now - 2.20.0 Added: trunk/sound/data/alsa_drivers.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/alsa_drivers.rb trunk/sound/data/data_cards.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/data_cards.rb trunk/sound/data/data_extra_ids.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/data_extra_ids.rb trunk/sound/data/data_joystick.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/data_joystick.rb trunk/sound/data/data_mixer.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/data_mixer.rb trunk/sound/data/generate_soundcard_db.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/generate_soundcard_db.rb trunk/sound/data/sound_db_generator.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/sound_db_generator.rb trunk/sound/data/ycp_format.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/ycp_format.rb Removed: trunk/sound/data/Makefile.generate trunk/sound/data/addons/ trunk/sound/data/alsa-module-syntax trunk/sound/data/include/ trunk/sound/data/map_indent/ trunk/sound/data/proofread_strings trunk/sound/data/sndcards.ycp trunk/sound/data/src/ trunk/sound/data/translate_strings.pl Modified: trunk/sound/ (props changed) trunk/sound/VERSION trunk/sound/data/Makefile.am trunk/sound/data/doc/README trunk/sound/package/yast2-sound.changes trunk/sound/yast2-sound.spec.in Modified: trunk/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/VERSION?rev=62779&r1=62778… ============================================================================== --- trunk/sound/VERSION (original) +++ trunk/sound/VERSION Tue Nov 9 14:59:28 2010 @@ -1 +1 @@ -2.19.1 +2.20.0 Modified: trunk/sound/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/Makefile.am?rev=62779… ============================================================================== --- trunk/sound/data/Makefile.am (original) +++ trunk/sound/data/Makefile.am Tue Nov 9 14:59:28 2010 @@ -4,8 +4,17 @@ # $Id$ # -SUBDIRS = addons doc include src +SUBDIRS = doc -ydata_DATA = sndcards.ycp alsa_packages.ycp +ydata_DATA = alsa_packages.ycp sndcards.ycp -EXTRA_DIST = $(ydata_DATA) Makefile.generate alsa-module-syntax proofread_strings translate_strings.pl +sound_db_generator = alsa_drivers.rb data_cards.rb data_joystick.rb data_mixer.rb data_extra_ids.rb generate_soundcard_db.rb sound_db_generator.rb ycp_format.rb + +sndcards.ycp: $(sound_db_generator) + ./generate_soundcard_db.rb > sndcards.ycp +# verify the validity (syntax check) + ycpc -E -q sndcards.ycp + +CLEANFILES = sndcards.ycp + +EXTRA_DIST = alsa_packages.ycp $(sound_db_generator) Modified: trunk/sound/data/doc/README URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/doc/README?rev=62779&… ============================================================================== --- trunk/sound/data/doc/README (original) +++ trunk/sound/data/doc/README Tue Nov 9 14:59:28 2010 @@ -1,22 +1,17 @@ -you need to have alsa 0.9 or newer installed. -don't forget to set 'export Y2DIR=.' when generating database +The sound card databe is generated automatically during +package build using drivers from kernel-default package. file description: -README this file -idlist.ycp autogenerated file from /lib/modules/ver#/modules.generic_string - contains map with vendor_id and device_id keys for searching - for the appropriate kernel module. leaves are indices to - module_index map that is contained in modules_index.ycp -gen_card_list.ycp script that generates the cardlist.ycp database -gen_id_list.ycp script that generates the idlist.ycp database -gen_opt_list.ycp script that generates the modlist.ycp databse -idlist.ycp autogenerated map: for each module index contains list of - card labels (used for manual card addition) -include/gen_routines.ycp common routines for generating database -modlist.ycp autogenerated map: for each module as a key contains - a map as value, where important info about the module - is stored. -module_index.ycp manually generated database: used for saveing space in - idlist.ycp database. +README this file +alsa_drivers.rb collects data from drivers +alsa_packages.ycp static data - extra packages for drivers +data_cards.rb static data - sound card names +data_extra_ids.rb static data - extra PCI ids for drivers +data_joystick.rb static data - joystick data +data_mixer.rb static data - mixer settings for specific drivers +generate_soundcard_db.rb creates the database +sndcards.ycp generated sound card database +sound_db_generator.rb collects all data for database +ycp_format.rb helper - Ruby to YCP conversion Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Tue Nov 9 14:59:28 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Nov 9 13:54:33 UTC 2010 - lslezak(a)suse.cz + +- build the soundcard database during package build - use + the existing ALSA drivers, the DB is always up to date + and is architecture dependent now +- 2.20.0 + +------------------------------------------------------------------- Thu Oct 14 12:32:32 UTC 2010 - lslezak(a)suse.cz - make the joystick dialog label better translatable in RTL Modified: trunk/sound/yast2-sound.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/yast2-sound.spec.in?rev=62… ============================================================================== --- trunk/sound/yast2-sound.spec.in (original) +++ trunk/sound/yast2-sound.spec.in Tue Nov 9 14:59:28 2010 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST License: GPL v2 or later -BuildRequires: alsa-devel gcc-c++ doxygen perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite +BuildRequires: alsa-devel gcc-c++ doxygen perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite kernel-default ruby # GetInstArgs::automatic_configuration Requires: yast2 >= 2.16.46 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62778 - in /branches/tmp/lslezak/sound: ./ data/ data/doc/
by lslezak＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: lslezak Date: Tue Nov 9 14:49:01 2010 New Revision: 62778 URL: http://svn.opensuse.org/viewcvs/yast?rev=62778&view=rev Log: include USB and PPC cards in the sound card DB Added: branches/tmp/lslezak/sound/data/data_extra_ids.rb Modified: branches/tmp/lslezak/sound/VERSION branches/tmp/lslezak/sound/data/Makefile.am branches/tmp/lslezak/sound/data/alsa_drivers.rb branches/tmp/lslezak/sound/data/data_cards.rb branches/tmp/lslezak/sound/data/doc/README branches/tmp/lslezak/sound/data/generate_soundcard_db.rb branches/tmp/lslezak/sound/data/sound_db_generator.rb branches/tmp/lslezak/sound/data/ycp_format.rb Modified: branches/tmp/lslezak/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/VERSION?rev… ============================================================================== --- branches/tmp/lslezak/sound/VERSION (original) +++ branches/tmp/lslezak/sound/VERSION Tue Nov 9 14:49:01 2010 @@ -1 +1 @@ -2.19.2 +2.20.0 Modified: branches/tmp/lslezak/sound/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/data/Makefi… ============================================================================== --- branches/tmp/lslezak/sound/data/Makefile.am (original) +++ branches/tmp/lslezak/sound/data/Makefile.am Tue Nov 9 14:49:01 2010 @@ -8,7 +8,7 @@ ydata_DATA = alsa_packages.ycp sndcards.ycp -sound_db_generator = alsa_drivers.rb data_cards.rb data_joystick.rb data_mixer.rb generate_soundcard_db.rb sound_db_generator.rb ycp_format.rb +sound_db_generator = alsa_drivers.rb data_cards.rb data_joystick.rb data_mixer.rb data_extra_ids.rb generate_soundcard_db.rb sound_db_generator.rb ycp_format.rb sndcards.ycp: $(sound_db_generator) ./generate_soundcard_db.rb > sndcards.ycp Modified: branches/tmp/lslezak/sound/data/alsa_drivers.rb URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/data/alsa_d… ============================================================================== --- branches/tmp/lslezak/sound/data/alsa_drivers.rb (original) +++ branches/tmp/lslezak/sound/data/alsa_drivers.rb Tue Nov 9 14:49:01 2010 @@ -43,7 +43,7 @@ end # class for handling kernel driver info -# (description, device alliases,...) +# (description, device aliases,...) class AlsaModule attr_reader :mod_path @@ -72,6 +72,11 @@ ret << ModAlias.new(a) if a.match /^pci:/ end + extra_ids = eval(File.read(File.join(File.dirname(__FILE__), 'data_extra_ids.rb'))) + extra_ids.each do |id| + ret << ModAlias.new("pci:v#{id[1]}d#{id[2]}sv*sd*") if id[0] == name + end + ret end @@ -100,10 +105,12 @@ ret end - # find all snound drivers below the given path + # find all sound drivers below the given path def self.find_all(path) ret = [] - lst = `find #{path} -type f -name 'snd-*.ko'`.split("\n") + lst = `find #{path} -type f -name 'snd-*.ko'`.split("\n").sort{|p1, p2| + p1.split('/').last <=> p2.split('/').last + } lst.each do |m| ret << AlsaModule.new(m) Modified: branches/tmp/lslezak/sound/data/data_cards.rb URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/data/data_c… ============================================================================== --- branches/tmp/lslezak/sound/data/data_cards.rb (original) +++ branches/tmp/lslezak/sound/data/data_cards.rb Tue Nov 9 14:49:01 2010 @@ -28,7 +28,7 @@ ["snd-als4000", "XWave4000, Labway"], ["snd-als4000", "ALS4000, Avance Logic"], ["snd-atiixp", "IXP150/200/250/300/400, ATI"], - ["snd-atiixp-modem", "IXP150/200/250/400 (modem), ATI"], + ["snd-atiixp-modem", "IXP150/200/250/400 (modem), ATI"], ["snd-au8810", "Aureal Vortex AU8810, Aureal Semiconductor Inc."], ["snd-au8820", "Aureal Vortex AU8820, Aureal Semiconductor Inc."], ["snd-au8830", "Aureal Vortex AU8830, Aureal Semiconductor Inc."], @@ -338,6 +338,10 @@ ["snd-trident", "True Sound 4Dwave, CHIC"], ["snd-usb-audio", "USB Audio, Generic"], ["snd-usb-usx2y", "US122/224/428, Tascam"], + ["snd-usb-caiaq", "USB audio, caiaq"], + ["snd-ua101", "UA-101, Edirol"], + ["snd-ua101", "UA-1000, Edirol"], + ["snd-usb-us122l", "US-122L, Tascam"], ["snd-via82xx", "VT8233A/C, VIA"], ["snd-via82xx", "VT8235, VIA"], ["snd-via82xx", "VT8237, VIA"], Added: branches/tmp/lslezak/sound/data/data_extra_ids.rb URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/data/data_e… ============================================================================== --- branches/tmp/lslezak/sound/data/data_extra_ids.rb (added) +++ branches/tmp/lslezak/sound/data/data_extra_ids.rb Tue Nov 9 14:49:01 2010 @@ -0,0 +1,7 @@ +[ + # extra id's for powermacs: + ["snd-powermac", "030401", "030010"], + ["snd-powermac", "030401", "030011"], + ["snd-powermac", "030401", "030012"], + ["snd-powermac", "030401", "030013"] +] Modified: branches/tmp/lslezak/sound/data/doc/README URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/data/doc/RE… ============================================================================== --- branches/tmp/lslezak/sound/data/doc/README (original) +++ branches/tmp/lslezak/sound/data/doc/README Tue Nov 9 14:49:01 2010 @@ -1,22 +1,17 @@ -you need to have alsa 0.9 or newer installed. -don't forget to set 'export Y2DIR=.' when generating database +The sound card databe is generated automatically during +package build using drivers from kernel-default package. file description: -README this file -idlist.ycp autogenerated file from /lib/modules/ver#/modules.generic_string - contains map with vendor_id and device_id keys for searching - for the appropriate kernel module. leaves are indices to - module_index map that is contained in modules_index.ycp -gen_card_list.ycp script that generates the cardlist.ycp database -gen_id_list.ycp script that generates the idlist.ycp database -gen_opt_list.ycp script that generates the modlist.ycp databse -idlist.ycp autogenerated map: for each module index contains list of - card labels (used for manual card addition) -include/gen_routines.ycp common routines for generating database -modlist.ycp autogenerated map: for each module as a key contains - a map as value, where important info about the module - is stored. -module_index.ycp manually generated database: used for saveing space in - idlist.ycp database. +README this file +alsa_drivers.rb collects data from drivers +alsa_packages.ycp static data - extra packages for drivers +data_cards.rb static data - sound card names +data_extra_ids.rb static data - extra PCI ids for drivers +data_joystick.rb static data - joystick data +data_mixer.rb static data - mixer settings for specific drivers +generate_soundcard_db.rb creates the database +sndcards.ycp generated sound card database +sound_db_generator.rb collects all data for database +ycp_format.rb helper - Ruby to YCP conversion Modified: branches/tmp/lslezak/sound/data/generate_soundcard_db.rb URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/data/genera… ============================================================================== --- branches/tmp/lslezak/sound/data/generate_soundcard_db.rb (original) +++ branches/tmp/lslezak/sound/data/generate_soundcard_db.rb Tue Nov 9 14:49:01 2010 @@ -1,6 +1,6 @@ #!/usr/bin/ruby -# read all statis predefined databases +# read all static predefined databases require File.join(File.dirname(__FILE__), "alsa_drivers.rb") require File.join(File.dirname(__FILE__), "sound_db_generator.rb") require File.join(File.dirname(__FILE__), "ycp_format.rb") Modified: branches/tmp/lslezak/sound/data/sound_db_generator.rb URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/data/sound_… ============================================================================== --- branches/tmp/lslezak/sound/data/sound_db_generator.rb (original) +++ branches/tmp/lslezak/sound/data/sound_db_generator.rb Tue Nov 9 14:49:01 2010 @@ -1,4 +1,4 @@ -# class for generating the sound card databased +# class for generating the sound card database class SoucardDBGenerator private @@ -133,10 +133,16 @@ # generate the complete sound card database # read the static databases, - # create the subparts and puth them all together + # create the subparts and put them all together def self.generate_sound_card_db(path) amodules = AlsaModule.find_all path - amodules.reject!{|m| m.modaliases.size.zero? && m.name != 'snd-dummy' && m.name != 'snd-virmidi'} + + # add these drivers although they don't contain any PCI aliases + # (dummy drivers, USB drivers, PPC drivers) + xtra_drivers = ['snd-dummy', 'snd-virmidi', 'snd-aoa', 'snd-usb-audio', + 'snd-usb-caiaq', 'snd-ua101', 'snd-usb-us122l', 'snd-usb-usx2y'] + + amodules.reject!{|m| m.modaliases.size.zero? && !xtra_drivers.include?(m.name)} card_addons = eval(File.read(File.join(File.dirname(__FILE__), 'data_cards.rb'))) joy_modules = eval(File.read(File.join(File.dirname(__FILE__), 'data_joystick.rb'))) @@ -154,7 +160,7 @@ "kernel" => kernel_ver } - # add a header with kernel version string nad YCP wrapping + # add a header with kernel version string and YCP wrapping header = "/* This file was automatically generated for kernel version #{$1} */\n" header +=<<EOF Modified: branches/tmp/lslezak/sound/data/ycp_format.rb URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/data/ycp_fo… ============================================================================== --- branches/tmp/lslezak/sound/data/ycp_format.rb (original) +++ branches/tmp/lslezak/sound/data/ycp_format.rb Tue Nov 9 14:49:01 2010 @@ -29,6 +29,12 @@ end end +class Bignum + def to_ycp(indent = 0) + self.to_s + end +end + class Hash def to_ycp(indent = 0) ret = '' -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62777 - in /branches/SuSE-Code-11-SP1-Branch/gtk/src: Makefile.am YGPackageSelector.cc YGTable.cc ygtkscrolledwindow.c ygtkscrolledwindow.h ygtktreeview.c ygtktreeview.h
by rpmcruz＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: rpmcruz Date: Tue Nov 9 14:44:55 2010 New Revision: 62777 URL: http://svn.opensuse.org/viewcvs/yast?rev=62777&view=rev Log: * src/YGTable.cc: using new code in its place. * src/ygtktreeview.h & src/ygtktreeview.c: replaced old ygtkscrolledwindow files. * src/YGPackageSelector.cc: cope with new ygtktreeview. Added: branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtktreeview.c branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtktreeview.h Removed: branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtkscrolledwindow.c branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtkscrolledwindow.h Modified: branches/SuSE-Code-11-SP1-Branch/gtk/src/Makefile.am branches/SuSE-Code-11-SP1-Branch/gtk/src/YGPackageSelector.cc branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc Modified: branches/SuSE-Code-11-SP1-Branch/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/src/Makefile.am Tue Nov 9 14:44:55 2010 @@ -60,7 +60,7 @@ ygdkmngloader.c \ ygtkimage.c \ ygtkcellrenderertextpixbuf.c \ - ygtkscrolledwindow.c \ + ygtktreeview.c \ ygtktogglebutton.c \ ygtkhtmlwrap.c \ ygtktimezonepicker.c \ Modified: branches/SuSE-Code-11-SP1-Branch/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/src/YGPackageSelector.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/src/YGPackageSelector.cc Tue Nov 9 14:44:55 2010 @@ -20,7 +20,7 @@ #include "ygtkwizard.h" #include "ygtkfindentry.h" #include "ygtkmenubutton.h" -#include "ygtkscrolledwindow.h" +#include "ygtktreeview.h" #include "ygtktogglebutton.h" #include "ygtkhtmlwrap.h" #include "ygtkrichtext.h" @@ -423,7 +423,7 @@ TreeView (bool isTree, bool descriptiveTooltip, bool editable, PackagesView *parent) : View (parent), m_isTree (isTree), m_descriptiveTooltip (descriptiveTooltip) { - GtkTreeView *view = GTK_TREE_VIEW (m_widget = ygtk_tree_view_new()); + GtkTreeView *view = GTK_TREE_VIEW (m_widget = ygtk_tree_view_new (_("No matches."))); gtk_tree_view_set_headers_visible (view, FALSE); gtk_tree_view_set_search_column (view, YGtkZyppModel::NAME_COLUMN); gtk_tree_view_set_fixed_height_mode (view, TRUE); @@ -735,17 +735,10 @@ : m_listener (NULL), m_model (NULL), m_view (NULL), m_isTree (isTree), m_descriptiveTooltip (descriptiveTooltip) { if (useScrollWindow) { - m_bin = ygtk_scrolled_window_new(); - if (enableTilesMode) { - GtkWidget *buttons = gtk_vbox_new (FALSE, 0), *button; - button = create_toggle_button ("pkg-list-mode.xpm", _("View as list"), NULL); - gtk_box_pack_start (GTK_BOX (buttons), button, FALSE, TRUE, 0); - button = create_toggle_button ("pkg-tiles-mode.xpm", _("View as grid"), button); - gtk_box_pack_start (GTK_BOX (buttons), button, FALSE, TRUE, 0); - gtk_widget_show_all (buttons); - - ygtk_scrolled_window_set_corner_widget (YGTK_SCROLLED_WINDOW (m_bin), buttons); - } + m_bin = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_bin), + GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (m_bin), GTK_SHADOW_IN); } else m_bin = gtk_event_box_new(); Modified: branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc Tue Nov 9 14:44:55 2010 @@ -1,7 +1,11 @@ /******************************************************************** * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ +/* + Textdomain "gtk" + */ +#include "YGi18n.h" #define YUILogComponent "gtk" #include "config.h" #include "YGUI.h" @@ -9,8 +13,7 @@ #include "YGWidget.h" #include "YSelectionWidget.h" #include "YGSelectionModel.h" -#include "ygtkcellrenderertextpixbuf.h" -#include "ygtkscrolledwindow.h" +#include "ygtktreeview.h" /* A generic widget for table related widgets. */ class YGTableView : public YGScrolledWidget, public YGSelectionModel @@ -56,31 +59,27 @@ void appendIconTextColumn (string header, YAlignmentType align, int icon_col, int text_col) { - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - - renderer = ygtk_cell_renderer_text_pixbuf_new(); - column = gtk_tree_view_column_new_with_attributes (header.c_str(), - renderer, "pixbuf", icon_col, "text", text_col, NULL); - gfloat xalign = -1; switch (align) { - case YAlignBegin: - xalign = 0.0; - break; - case YAlignCenter: - xalign = 0.5; - break; - case YAlignEnd: - xalign = 1.0; - break; - case YAlignUnchanged: - break; + case YAlignBegin: xalign = 0.0; break; + case YAlignCenter: xalign = 0.5; break; + case YAlignEnd: xalign = 1.0; break; + case YAlignUnchanged: break; } - if (xalign != -1) { + + GtkTreeViewColumn *column = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title (column, header.c_str()); + GtkCellRenderer *renderer; + + renderer = gtk_cell_renderer_pixbuf_new(); + gtk_tree_view_column_pack_start (column, renderer, FALSE); + gtk_tree_view_column_set_attributes (column, renderer, "pixbuf", icon_col, NULL); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start (column, renderer, TRUE); + gtk_tree_view_column_set_attributes (column, renderer, "text", text_col, NULL); + if (xalign != -1) g_object_set (renderer, "xalign", xalign, NULL); - gtk_tree_view_column_set_alignment (column, xalign); - } gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (getView(), column); @@ -88,14 +87,10 @@ void appendCheckColumn (string header, int bool_col) { - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - - renderer = gtk_cell_renderer_toggle_new(); + GtkCellRenderer *renderer = gtk_cell_renderer_toggle_new(); g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (bool_col)); - column = gtk_tree_view_column_new_with_attributes (header.c_str(), - renderer, "active", bool_col, NULL); - + GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ( + header.c_str(), renderer, "active", bool_col, NULL); g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (toggled_cb), this); @@ -103,10 +98,8 @@ gtk_tree_view_append_column (getView(), column); } - void appendDumbColumn() - { - gtk_tree_view_append_column (getView(), gtk_tree_view_column_new()); - } + void appendEmptyColumn() + { gtk_tree_view_append_column (getView(), gtk_tree_view_column_new()); } void setModel() { gtk_tree_view_set_model (GTK_TREE_VIEW (getWidget()), getModel()); } @@ -227,9 +220,7 @@ #if YAST2_VERSION > 2018003 static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGTableView *pThis) - { - pThis->emitEvent (YEvent::ContextMenuActivated); - } + { pThis->emitEvent (YEvent::ContextMenuActivated); } #endif }; @@ -252,6 +243,7 @@ { gtk_tree_view_set_headers_visible (getView(), TRUE); gtk_tree_view_set_rules_hint (getView(), columns() > 1); + ygtk_tree_view_set_empty_text (YGTK_TREE_VIEW (getView()), _("No entries.")); #if YAST2_VERSION >= 2017005 if (multiSelection) gtk_tree_selection_set_mode (getSelection(), GTK_SELECTION_MULTIPLE); @@ -268,7 +260,7 @@ appendIconTextColumn (header (i), align, col, col+1); if ((align == YAlignCenter || align == YAlignEnd) && i == columns()-1) // if last col is aligned: add another so that it doesn't expand. - appendDumbColumn(); + appendEmptyColumn(); } setModel(); if (!keepSorting()) @@ -308,8 +300,8 @@ if (label == "X") label = YUI::app()->glyph (YUIGlyph_CheckMark); } - setCellIcon (iter, index, icon); - setCellLabel (iter, index+1, label); + setCellIcon (iter, index, icon); + setCellLabel (iter, index+1, label); } void setSortable (bool sortable) @@ -372,17 +364,6 @@ static void hack_right_click_cb (YGtkTreeView *view, gboolean outreach, YGTable *pThis) { -#if YAST2_VERSION > 2018003 - if (pThis->notifyContextMenu()) - return YGTableView::right_click_cb (view, outreach, pThis); -#endif - if (!YGDialog::currentDialog()->getFunctionWidget (5) || - // undetermined case -- more than one table exists - YGDialog::currentDialog()->getClassWidgets ("YTable").size() > 1) { - gtk_widget_error_bell (GTK_WIDGET (view)); - return; - } - struct inner { static void key_activate_cb (GtkMenuItem *item, YWidget *button) { activateButton (button); } @@ -394,18 +375,33 @@ item = gtk_image_menu_item_new_from_stock (stock, NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (key_activate_cb), button); + G_CALLBACK (key_activate_cb), button); } } }; +#if YAST2_VERSION > 2018003 + if (pThis->notifyContextMenu()) + return YGTableView::right_click_cb (view, outreach, pThis); +#endif GtkWidget *menu = gtk_menu_new(); - if (outreach) - inner::appendItem (menu, GTK_STOCK_ADD, 3); - else { - inner::appendItem (menu, GTK_STOCK_EDIT, 4); - inner::appendItem (menu, GTK_STOCK_DELETE, 5); + + YGDialog *dialog = YGDialog::currentDialog(); + if (dialog->getClassWidgets ("YTable").size() == 1) { + // if more than one table exists, function keys become ambiguous + if (outreach) { + if (dialog->getFunctionWidget(3)) + inner::appendItem (menu, GTK_STOCK_ADD, 3); + } + else { + if (dialog->getFunctionWidget(4)) + inner::appendItem (menu, GTK_STOCK_EDIT, 4); + if (dialog->getFunctionWidget(5)) + inner::appendItem (menu, GTK_STOCK_DELETE, 5); + } } + + menu = ygtk_tree_view_append_show_columns_item (YGTK_TREE_VIEW (view), menu); ygtk_tree_view_popup_menu (view, menu); } @@ -429,9 +425,10 @@ gchar *str_a, *str_b; gtk_tree_model_get (model, a, index, &str_a, -1); gtk_tree_model_get (model, b, index, &str_b, -1); + if (!str_a) str_a = g_strdup (""); + if (!str_b) str_b = g_strdup (""); int ret = strcmp (str_a, str_b); - g_free (str_a); - g_free (str_b); + g_free (str_a); g_free (str_b); return ret; } @@ -464,7 +461,7 @@ connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView *) this); connect (getSelection(), "changed", G_CALLBACK (selection_changed_cb), (YGTableView *) this); #if YAST2_VERSION > 2018003 - connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); + connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), (YGTableView *) this); #endif } @@ -500,7 +497,7 @@ // Let the user toggle, using space/enter or double click (not an event). connect (getWidget(), "row-activated", G_CALLBACK (multi_activated_cb), this); #if YAST2_VERSION > 2018003 - connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); + connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), (YGTableView *) this); #endif } @@ -574,7 +571,7 @@ connect (getWidget(), "cursor-changed", G_CALLBACK (row_selected_cb), this); connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView *) this); #if YAST2_VERSION > 2018003 - connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); + connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), (YGTableView *) this); #endif } Added: branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtktreeview.c URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtktreeview.c (added) +++ branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtktreeview.c Tue Nov 9 14:44:55 2010 @@ -0,0 +1,267 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ +/* YGtkTreeView widget */ +// check the header file for information about this widget + +/* + Textdomain "gtk" + */ + +#include <config.h> +#include "ygtktreeview.h" +#include <gtk/gtk.h> +#define YGI18N_C +#include "YGi18n.h" + +static guint right_click_signal = 0; + +G_DEFINE_TYPE (YGtkTreeView, ygtk_tree_view, GTK_TYPE_TREE_VIEW) + +static void ygtk_tree_view_init (YGtkTreeView *view) +{ +} + +static void ygtk_tree_view_finalize (GObject *object) +{ + YGtkTreeView *view = YGTK_TREE_VIEW (object); + if (view->empty_text) { + g_free (view->empty_text); + view->empty_text = NULL; + } + G_OBJECT_CLASS (ygtk_tree_view_parent_class)->finalize (object); +} + +static void _gtk_widget_destroy (gpointer widget) +{ gtk_widget_destroy (GTK_WIDGET (widget)); } + +void ygtk_tree_view_popup_menu (YGtkTreeView *view, GtkWidget *menu) +{ + GtkWidget *widget = GTK_WIDGET (view); + // popup hack -- we can't destroy the menu at hide because it may not have + // emitted signals yet -- destroy it when replaced or the widget destroyed + g_object_set_data_full (G_OBJECT (view), "popup", menu, _gtk_widget_destroy); + + guint32 time = gtk_get_current_event_time(); + gtk_menu_attach_to_widget (GTK_MENU (menu), widget, NULL); + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 3, time); + gtk_widget_show_all (menu); +} + +static gboolean ygtk_tree_view_button_press_event (GtkWidget *widget, GdkEventButton *event) +{ + // workaround (based on gedit): we want the tree view to receive this press in order + // to select the row, but we can't use connect_after, so we throw a dummy mouse press + if (event->type == GDK_BUTTON_PRESS && event->button == 3) { + static gboolean safeguard = FALSE; + if (safeguard) return FALSE; + safeguard = TRUE; + + GtkTreeView *view = GTK_TREE_VIEW (widget); + GtkTreeSelection *selection = gtk_tree_view_get_selection (view); + + gboolean outreach; + outreach = !gtk_tree_view_get_path_at_pos (view, event->x, event->y, 0, 0, 0, 0); + if (gtk_tree_selection_count_selected_rows (selection) <= 1) { + // if there is a selection, let it be + event->button = 1; + if (!gtk_widget_event (widget, (GdkEvent *) event)) + return FALSE; + } + g_signal_emit (widget, right_click_signal, 0, outreach); + safeguard = FALSE; + return TRUE; + } + return GTK_WIDGET_CLASS (ygtk_tree_view_parent_class)->button_press_event (widget, event); +} + +static gboolean _ygtk_tree_view_popup_menu (GtkWidget *widget) +{ + GtkTreeView *view = GTK_TREE_VIEW (widget); + GtkTreeSelection *selection = gtk_tree_view_get_selection (view); + gboolean outreach = gtk_tree_selection_count_selected_rows (selection) == 0; + + g_signal_emit (widget, right_click_signal, 0, outreach); + return TRUE; +} + +static gboolean _ygtk_tree_view_expose_event (GtkWidget *widget, GdkEventExpose *event) +{ + GTK_WIDGET_CLASS (ygtk_tree_view_parent_class)->expose_event (widget, event); + + GtkTreeView *view = GTK_TREE_VIEW (widget); + YGtkTreeView *yview = YGTK_TREE_VIEW (widget); + if (yview->empty_text && event->window == gtk_tree_view_get_bin_window (view)) { + GtkTreeModel *model = gtk_tree_view_get_model (view); + GtkTreeIter iter; + if (!model || !gtk_tree_model_get_iter_first (model, &iter)) { // empty tree-view + const gchar *text = yview->empty_text; + if (!model) + text = _("Loading..."); + cairo_t *cr = gdk_cairo_create (event->window); + PangoLayout *layout; + layout = gtk_widget_create_pango_layout (widget, text); + + PangoAttrList *attrs = pango_attr_list_new(); + pango_attr_list_insert (attrs, pango_attr_foreground_new (160<<8, 160<<8, 160<<8)); + pango_layout_set_attributes (layout, attrs); + pango_attr_list_unref (attrs); + + int width, height; + pango_layout_get_pixel_size (layout, &width, &height); + int x, y; + x = (widget->allocation.width - width) / 2; + y = (widget->allocation.height - height) / 2; + cairo_move_to (cr, x, y); + + pango_cairo_show_layout (cr, layout); + g_object_unref (layout); + cairo_destroy (cr); + } + } + return FALSE; +} + +static void show_column_cb (GtkCheckMenuItem *item, GtkTreeView *view) +{ + int col = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "column")); + GtkTreeViewColumn *column = gtk_tree_view_get_column (view, col); + gboolean visible = gtk_check_menu_item_get_active (item); + gtk_tree_view_column_set_visible (column, visible); +} + +GtkWidget *ygtk_tree_view_create_show_columns_menu (YGtkTreeView *view) +{ + GtkWidget *menu = gtk_menu_new(); + GList *columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (view)); + // see ygtk_tree_view_append_column(): we re-order arabic column insertion + gboolean reverse = gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL && + gtk_widget_get_direction (GTK_WIDGET (view)) != GTK_TEXT_DIR_RTL; + int n; + GList *i; + for (n = 0, i = columns; i; i = i->next, n++) { + GtkTreeViewColumn *column = (GtkTreeViewColumn *) i->data; + const gchar *header = gtk_tree_view_column_get_title (column); + if (header) { + GtkWidget *item = gtk_check_menu_item_new_with_label (header); + g_object_set_data (G_OBJECT (item), "column", GINT_TO_POINTER (n)); + + gboolean visible = gtk_tree_view_column_get_visible (column); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), visible); + g_signal_connect (G_OBJECT (item), "toggled", + G_CALLBACK (show_column_cb), view); + + if (reverse) + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item); + else + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + + // if the user were to remove all columns, the right-click would no longer work + if (n == 0 && !reverse) + gtk_widget_set_sensitive (item, FALSE); + } + } + g_list_free (columns); + return menu; +} + +GtkWidget *ygtk_tree_view_append_show_columns_item (YGtkTreeView *view, GtkWidget *menu) +{ + if (!menu) + menu = gtk_menu_new(); + + GList *children = gtk_container_get_children (GTK_CONTAINER (menu)); + g_list_free (children); + if (children) // non-null if it has children (in which case, add separator) + gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new()); + + GtkWidget *submenu = ygtk_tree_view_create_show_columns_menu (view); + GtkWidget *item = gtk_menu_item_new_with_mnemonic (_("_Show column")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); + return menu; +} + +void ygtk_tree_view_append_column (YGtkTreeView *view, GtkTreeViewColumn *column) +{ + int pos = -1; + if (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL) { + gtk_widget_set_direction (GTK_WIDGET (view), GTK_TEXT_DIR_LTR); + + GList *renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column)), *i; + for (i = renderers; i; i = i->next) { + GtkCellRenderer *renderer = (GtkCellRenderer *) i->data; + if (GTK_IS_CELL_RENDERER_TEXT (renderer)) { + PangoAlignment alignment; + g_object_get (G_OBJECT (renderer), "alignment", &alignment, NULL); + if (alignment == PANGO_ALIGN_LEFT) + alignment = PANGO_ALIGN_RIGHT; + else if (alignment == PANGO_ALIGN_RIGHT) + alignment = PANGO_ALIGN_LEFT; + g_object_set (G_OBJECT (renderer), "alignment", alignment, NULL); + + gfloat xalign; + g_object_get (G_OBJECT (renderer), "xalign", &xalign, NULL); + xalign = 1.0 - xalign; + g_object_set (G_OBJECT (renderer), "xalign", xalign, NULL); + + PangoEllipsizeMode ellipsize; + g_object_get (G_OBJECT (renderer), "ellipsize", &ellipsize, NULL); + if (ellipsize == PANGO_ELLIPSIZE_END) + ellipsize = PANGO_ELLIPSIZE_START; + else if (ellipsize == PANGO_ELLIPSIZE_START) + ellipsize = PANGO_ELLIPSIZE_END; + g_object_set (G_OBJECT (renderer), "ellipsize", ellipsize, NULL); + } + } + g_list_free (renderers); + pos = 0; + } + gtk_tree_view_insert_column (GTK_TREE_VIEW (view), column, pos); +} + +GtkTreeViewColumn *ygtk_tree_view_get_column (YGtkTreeView *view, gint nb) +{ + GtkTreeViewColumn *column; + if (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL) { + GList *columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (view)); + nb = g_list_length (columns) - nb - 1; + column = g_list_nth_data (columns, nb); + g_list_free (columns); + } + else + column = gtk_tree_view_get_column (GTK_TREE_VIEW (view), nb); + return column; +} + + +void ygtk_tree_view_set_empty_text (YGtkTreeView *view, const gchar *empty_text) +{ + if (view->empty_text) + g_free (view->empty_text); + view->empty_text = empty_text ? g_strdup (empty_text) : NULL; +} + +GtkWidget *ygtk_tree_view_new (const gchar *empty_text) +{ + YGtkTreeView *view = (YGtkTreeView *) g_object_new (YGTK_TYPE_TREE_VIEW, NULL); + view->empty_text = empty_text ? g_strdup (empty_text) : NULL; + return GTK_WIDGET (view); +} + +static void ygtk_tree_view_class_init (YGtkTreeViewClass *klass) +{ + GtkWidgetClass *gtkwidget_class = GTK_WIDGET_CLASS (klass); + gtkwidget_class->button_press_event = ygtk_tree_view_button_press_event; + gtkwidget_class->popup_menu = _ygtk_tree_view_popup_menu; + gtkwidget_class->expose_event = _ygtk_tree_view_expose_event; + + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = ygtk_tree_view_finalize; + + right_click_signal = g_signal_new ("right-click", + G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (YGtkTreeViewClass, right_click), + NULL, NULL, gtk_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); +} + Added: branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtktreeview.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtktreeview.h (added) +++ branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtktreeview.h Tue Nov 9 14:44:55 2010 @@ -0,0 +1,62 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGtkTreeView hacks support for a right-click signal. +*/ + +#ifndef YGTK_TREE_VIEW_H +#define YGTK_TREE_VIEW_H + +#include <gtk/gtktreeview.h> +G_BEGIN_DECLS + +#define YGTK_TYPE_TREE_VIEW (ygtk_tree_view_get_type ()) +#define YGTK_TREE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGTK_TYPE_TREE_VIEW, YGtkTreeView)) +#define YGTK_TREE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + YGTK_TYPE_TREE_VIEW, YGtkTreeViewClass)) +#define YGTK_IS_TREE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + YGTK_TYPE_TREE_VIEW)) +#define YGTK_IS_TREE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + YGTK_TYPE_TREE_VIEW)) +#define YGTK_TREE_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + YGTK_TYPE_TREE_VIEW, YGtkTreeViewClass)) + +typedef struct _YGtkTreeView +{ + GtkTreeView parent; + + // members: + gchar *empty_text; +} YGtkTreeView; + +typedef struct _YGtkTreeViewClass +{ + GtkTreeViewClass parent_class; + + // signals: + void (*right_click) (YGtkTreeView *view, gboolean outreach); +} YGtkTreeViewClass; + +GtkWidget* ygtk_tree_view_new (const gchar *empty_text); /* null to disable */ +GType ygtk_tree_view_get_type (void) G_GNUC_CONST; + +void ygtk_tree_view_set_empty_text (YGtkTreeView *view, const gchar *empty_text); + +void ygtk_tree_view_popup_menu (YGtkTreeView *view, GtkWidget *menu); + +GtkWidget *ygtk_tree_view_create_show_columns_menu (YGtkTreeView *view); +GtkWidget *ygtk_tree_view_append_show_columns_item (YGtkTreeView *view, GtkWidget *menu); + +// use this method of adding columns to overload gtk Arabic tree-view layout by +// a more sane and simpler one. +// (if you do, use it for all your column adding needs.) +void ygtk_tree_view_append_column (YGtkTreeView *view, GtkTreeViewColumn *column); + +// use this if you have used our ygtk_tree_view_append_column() +GtkTreeViewColumn *ygtk_tree_view_get_column (YGtkTreeView *view, gint nb); + +G_END_DECLS +#endif /*YGTK_TREE_VIEW_H*/ + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62776 - /tags/branch-SLE-10-SP4-2_13_189/packager/
by jsrain＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jsrain Date: Tue Nov 9 14:44:29 2010 New Revision: 62776 URL: http://svn.opensuse.org/viewcvs/yast?rev=62776&view=rev Log: Created tag branch-SLE-10-SP4-2_13_189 for packager Added: tags/branch-SLE-10-SP4-2_13_189/packager/ (props changed) - copied from r62775, branches/SuSE-SLE-10-SP4-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62775 - /tags/branch-SLE-10-SP4-2_13_189/
by jsrain＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jsrain Date: Tue Nov 9 14:44:24 2010 New Revision: 62775 URL: http://svn.opensuse.org/viewcvs/yast?rev=62775&view=rev Log: Created tag branch-SLE-10-SP4-2_13_189 Added: tags/branch-SLE-10-SP4-2_13_189/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62774 - /branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp
by jsrain＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jsrain Date: Tue Nov 9 14:44:17 2010 New Revision: 62774 URL: http://svn.opensuse.org/viewcvs/yast?rev=62774&view=rev Log: syntax fix Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Tue Nov 9 14:44:17 2010 @@ -58,7 +58,7 @@ void HyperVPVToInitrd() { // check the running hypervisor - if (0 == (integer)SCR::Execute(.target.bash, "LANG=C lscpu | grep 'Hypervisor vendor:[[:space:]]*Microsoft' >/dev/null"); + if (0 == (integer)SCR::Execute(.target.bash, "LANG=C lscpu | grep 'Hypervisor vendor:[[:space:]]*Microsoft' >/dev/null")) { // add modules to initrd Initrd::AddModule ("blkvsc", ""); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62773 - in /branches/SuSE-SLE-10-SP4-Branch/packager: VERSION package/yast2-packager.changes src/clients/inst_kickoff.ycp
by jsrain＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jsrain Date: Tue Nov 9 14:43:21 2010 New Revision: 62773 URL: http://svn.opensuse.org/viewcvs/yast?rev=62773&view=rev Log: detect HyperV according to lscpu (bnc#652305) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Tue Nov 9 14:43:21 2010 @@ -1 +1 @@ -2.13.188 +2.13.189 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes Tue Nov 9 14:43:21 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 9 13:50:17 CET 2010 - jsrain(a)suse.cz + +- detect HyperV according to lscpu (bnc#652305) +- 2.13.189 + +------------------------------------------------------------------- Mon Nov 8 13:35:25 CET 2010 - jsrain(a)suse.cz - add HyperV drivers to initrd (bnc#651348) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Tue Nov 9 14:43:21 2010 @@ -57,8 +57,8 @@ } void HyperVPVToInitrd() { - // can the kernel modules be loaded? - if (0 == (integer)SCR::Execute(.target.bash, "/sbin/modprobe vmbus")) + // check the running hypervisor + if (0 == (integer)SCR::Execute(.target.bash, "LANG=C lscpu | grep 'Hypervisor vendor:[[:space:]]*Microsoft' >/dev/null"); { // add modules to initrd Initrd::AddModule ("blkvsc", ""); @@ -76,7 +76,7 @@ } else { - y2milestone("Cannot load vmbus kernel module, skipping HyperV PV driver installation"); + y2milestone("HyperV hypervisor not detected"); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62772 - in /branches/SuSE-Code-11-SP1-Branch/gtk: 10_3/ integrate/ mockups/ tests/ ycc/
by rpmcruz＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: rpmcruz Date: Tue Nov 9 14:43:14 2010 New Revision: 62772 URL: http://svn.opensuse.org/viewcvs/yast?rev=62772&view=rev Log: Removing unnecessary files. Removed: branches/SuSE-Code-11-SP1-Branch/gtk/10_3/ branches/SuSE-Code-11-SP1-Branch/gtk/integrate/ branches/SuSE-Code-11-SP1-Branch/gtk/mockups/ branches/SuSE-Code-11-SP1-Branch/gtk/tests/ branches/SuSE-Code-11-SP1-Branch/gtk/ycc/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62771 - /tags/stable-2_20_3/product-creator/
by jsuchome＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jsuchome Date: Tue Nov 9 14:40:47 2010 New Revision: 62771 URL: http://svn.opensuse.org/viewcvs/yast?rev=62771&view=rev Log: Created tag stable-2_20_3 for product-creator Added: tags/stable-2_20_3/product-creator/ - copied from r62770, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62770 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp src/routines.ycp
by jsuchome＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jsuchome Date: Tue Nov 9 14:40:39 2010 New Revision: 62770 URL: http://svn.opensuse.org/viewcvs/yast?rev=62770&view=rev Log: - added option to build i586 images on i686 system (bnc#644895) - 2.20.3 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/src/routines.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6277… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Tue Nov 9 14:40:39 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Tue Nov 9 14:40:39 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 9 14:37:48 CET 2010 - jsuchome(a)suse.cz + +- added option to build i586 images on i686 system (bnc#644895) +- 2.20.3 + +------------------------------------------------------------------- Tue Oct 12 13:32:37 UTC 2010 - lslezak(a)suse.cz - don't use obsoleted inst_packages.ycp client, use PackagesUI.ycp Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Tue Nov 9 14:40:39 2010 @@ -47,6 +47,9 @@ // target architecture of image (can be only i386 if different from current one) global string image_architecture = ""; + // if target architecture should be i586 instead of i686 + global boolean target_i586 = false; + // directories with user-made templated global list<string> templates_dirs = []; @@ -566,9 +569,16 @@ } string linux32 = ""; + string target_arch = ""; // rather set target_arch only in one specific case if (Arch::architecture () == "x86_64" && ProductCreator::GetArch () == "i386") + { linux32 = "linux32"; - string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir, linux32); + } + if (ProductCreator::GetArch () == "i386" && target_i586) + { + target_arch = "--target-arch i586"; + } + string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal %4", chroot_dir, config_dir, linux32, target_arch); if (selected_profiles != "" && selected_profiles != nil) cmd = cmd + selected_profiles; @@ -615,8 +625,8 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal", - chroot_dir, out_dir, linux32); + cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal %4", + chroot_dir, out_dir, linux32, target_arch); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Tue Nov 9 14:40:39 2010 @@ -2276,11 +2276,15 @@ { arch_term = `VBox ( // checkbox label - `CheckBox (`id (`i386), `opt (`hstretch), _("&32bit Architecture Image"), + `CheckBox (`id (`i386), `opt (`notify, `hstretch), _("&32bit Architecture Image"), Kiwi::image_architecture == "i386"), `VSpacing (0.2) ); } + arch_term = add (arch_term, + // checkbox label + `CheckBox (`id (`i586), `opt (`hstretch), _("Target is i586 only"), Kiwi::target_i586)); + arch_term = add (arch_term, `VSpacing (0.2)); term contents = `VBox ( new_configuration ? @@ -2367,6 +2371,10 @@ UI::ChangeWidget (`id (`import), `Enabled, false); UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum ()+".-_"); } + if (Arch::architecture () == "x86_64") + { + UI::ChangeWidget (`id (`i586), `Enabled, Kiwi::image_architecture == "i386"); + } any ret = nil; while (true) { @@ -2395,6 +2403,10 @@ UI::ChangeWidget (`id (`template), `Enabled, false); UI::ChangeWidget (`id (`import), `Enabled, false); } + if (ret == `i386) + { + UI::ChangeWidget (`id (`i586), `Enabled, UI::QueryWidget (`id (`i386), `Value)); + } if (ret == `import) { string dir = UI::AskForExistingDirectory ( @@ -2586,6 +2598,8 @@ } } + Kiwi::target_i586 = Kiwi::image_architecture == "i386" && (boolean) UI::QueryWidget (`id (`i586), `Value); + if (size (repositories) > 0) { map<string,integer> current_sources = $[]; Modified: trunk/product-creator/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/routines.ycp… ============================================================================== --- trunk/product-creator/src/routines.ycp (original) +++ trunk/product-creator/src/routines.ycp Tue Nov 9 14:40:39 2010 @@ -45,12 +45,15 @@ if (typemap["primary"]:"false" == "true") { task = typemap[Kiwi::content_key]:task; + if (task == "" && typemap["image"]:"" != "") + task = typemap["image"]:""; break; } }); if (task == "") { y2milestone ("no task found, setting to 'iso'"); + task = "iso"; } return task; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62769 - /tags/branch-Code-11-SP1-2_17_38/product-creator/
by jsuchome＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jsuchome Date: Tue Nov 9 14:38:16 2010 New Revision: 62769 URL: http://svn.opensuse.org/viewcvs/yast?rev=62769&view=rev Log: Created tag branch-Code-11-SP1-2_17_38 for product-creator Added: tags/branch-Code-11-SP1-2_17_38/product-creator/ (props changed) - copied from r62768, branches/SuSE-Code-11-SP1-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62768 - in /branches/SuSE-Code-11-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn2.opensuse.org 09 Nov '10

09 Nov '10

Author: jsuchome Date: Tue Nov 9 14:38:08 2010 New Revision: 62768 URL: http://svn.opensuse.org/viewcvs/yast?rev=62768&view=rev Log: - added option to build i586 images on i686 system (bnc#644895) - 2.17.38 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION Tue Nov 9 14:38:08 2010 @@ -1 +1 @@ -2.17.37 +2.17.38 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes Tue Nov 9 14:38:08 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 9 14:19:59 CET 2010 - jsuchome(a)suse.cz + +- added option to build i586 images on i686 system (bnc#644895) +- 2.17.38 + +------------------------------------------------------------------- Thu Aug 5 13:19:11 CEST 2010 - jsuchome(a)suse.cz - command line mode fixes: initialize the sources, automatically Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/Kiwi.ycp Tue Nov 9 14:38:08 2010 @@ -47,6 +47,9 @@ // target architecture of image (can be only i386 if different from current one) global string image_architecture = ""; + // if target architecture should be i586 instead of i686 + global boolean target_i586 = false; + // directories with user-made templated global list<string> templates_dirs = []; @@ -566,9 +569,16 @@ } string linux32 = ""; + string target_arch = ""; // rather set target_arch only in one specific case if (Arch::architecture () == "x86_64" && ProductCreator::GetArch () == "i386") + { linux32 = "linux32"; - string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir, linux32); + } + if (ProductCreator::GetArch () == "i386" && target_i586) + { + target_arch = "--target-arch i586"; + } + string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal %4", chroot_dir, config_dir, linux32, target_arch); if (selected_profiles != "" && selected_profiles != nil) cmd = cmd + selected_profiles; @@ -615,8 +625,8 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal", - chroot_dir, out_dir, linux32); + cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal %4", + chroot_dir, out_dir, linux32, target_arch); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Tue Nov 9 14:38:08 2010 @@ -2279,11 +2279,15 @@ { arch_term = `VBox ( // checkbox label - `CheckBox (`id (`i386), `opt (`hstretch), _("&32bit Architecture Image"), + `CheckBox (`id (`i386), `opt (`notify, `hstretch), _("&32bit Architecture Image"), Kiwi::image_architecture == "i386"), `VSpacing (0.2) ); } + arch_term = add (arch_term, + // checkbox label + `CheckBox (`id (`i586), `opt (`hstretch), _("Target is i586 only"), Kiwi::target_i586)); + arch_term = add (arch_term, `VSpacing (0.2)); term contents = `VBox ( new_configuration ? @@ -2370,6 +2374,10 @@ UI::ChangeWidget (`id (`import), `Enabled, false); UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum ()+".-_"); } + if (Arch::architecture () == "x86_64") + { + UI::ChangeWidget (`id (`i586), `Enabled, Kiwi::image_architecture == "i386"); + } any ret = nil; while (true) { @@ -2398,6 +2406,10 @@ UI::ChangeWidget (`id (`template), `Enabled, false); UI::ChangeWidget (`id (`import), `Enabled, false); } + if (ret == `i386) + { + UI::ChangeWidget (`id (`i586), `Enabled, UI::QueryWidget (`id (`i386), `Value)); + } if (ret == `import) { string dir = UI::AskForExistingDirectory ( @@ -2589,6 +2601,8 @@ } } + Kiwi::target_i586 = Kiwi::image_architecture == "i386" && (boolean) UI::QueryWidget (`id (`i586), `Value); + if (size (repositories) > 0) { map<string,integer> current_sources = $[]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62767 - /tags/stable-2_20_3/country/
by lslezak＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: lslezak Date: Mon Nov 8 17:09:42 2010 New Revision: 62767 URL: http://svn.opensuse.org/viewcvs/yast?rev=62767&view=rev Log: Created tag stable-2_20_3 for country Added: tags/stable-2_20_3/country/ - copied from r62766, trunk/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62766 - in /trunk/country: VERSION language/src/language.ycp language/src/modules/Language.ycp language/src/select_language.ycp package/yast2-country.changes
by lslezak＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: lslezak Date: Mon Nov 8 17:09:36 2010 New Revision: 62766 URL: http://svn.opensuse.org/viewcvs/yast?rev=62766&view=rev Log: - don't install recommended packages for already installed packages when adding a new language (bnc#439373) - start the package manager when there are unresolved dependencies - 2.20.3 Modified: trunk/country/VERSION trunk/country/language/src/language.ycp trunk/country/language/src/modules/Language.ycp trunk/country/language/src/select_language.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=62766&r1=627… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Mon Nov 8 17:09:36 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/country/language/src/language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/language.yc… ============================================================================== --- trunk/country/language/src/language.ycp (original) +++ trunk/country/language/src/language.ycp Mon Nov 8 17:09:36 2010 @@ -74,16 +74,20 @@ Progress::NextStage (); boolean enough_space = true; + boolean solved = true; if (Language::PackagesModified () && !no_packages) { if (Mode::commandline ()) { // if not commandline, packages were already initialized in // select_language - enough_space = Language::PackagesInit ( + solved = Language::PackagesInit ( splitstring (Language::languages, ",")); + enough_space = Language::EnoughSpace(); + + y2milestone("Packages solved: %1, enough space; %2", solved, enough_space); } - if (enough_space) + if (enough_space && solved) { Language::PackagesCommit (); } Modified: trunk/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/modules/Lan… ============================================================================== --- trunk/country/language/src/modules/Language.ycp (original) +++ trunk/country/language/src/modules/Language.ycp Mon Nov 8 17:09:36 2010 @@ -889,20 +889,68 @@ y2milestone ("Saved data for language: <%1>", loc); } +boolean reset_recommended = true; + +// unselect all selected packages (bnc#439373) +// +// this is a workaround for installing recommened packages for already +// installed packages - we cannot simply set the solver flag +// as the laguage packages are also recommended, this would cause that +// no language package would be installed +// +// do this just once at the beginning +void ResetRecommendedPackaged() +{ + if (!reset_recommended) + { + return; + } + + Pkg::PkgSolve(true); + + list<map> selected_packages = Pkg::ResolvableProperties("", `package, ""); + + y2milestone("Unselecting already recommended packages"); + + // unselect them + foreach(map package, selected_packages, + { + if (package["status"]:`unknown == `selected) + { + y2milestone("Unselecting package: %1", package["name"]:""); + Pkg::PkgNeutral(package["name"]:""); + } + } + ); + + reset_recommended = false; +} + /** * Initializes source and target, * computes the packages necessary to install and uninstall, - * checks for disk space (#50745) - * @return false when there is not enough disk space for new packages + * @return false if the solver failed (unresolved dependencies) */ global define boolean PackagesInit (list<string> selected_languages) { PackageSystem::EnsureSourceInit (); PackageSystem::EnsureTargetInit (); + ResetRecommendedPackaged(); + Pkg::SetAdditionalLocales (selected_languages); - Pkg::PkgSolve (true); + boolean solved = Pkg::PkgSolve (true); + + return solved; +} + +/* + * checks for disk space (#50745) + * @return false when there is not enough disk space for new packages + */ +global define boolean EnoughSpace() +{ boolean ok = true; foreach (string mountpoint, list<integer> usage, Pkg::TargetGetDU (), { if (usage[2]:0 > usage[0]:0) Modified: trunk/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/select_lang… ============================================================================== --- trunk/country/language/src/select_language.ycp (original) +++ trunk/country/language/src/select_language.ycp Mon Nov 8 17:09:36 2010 @@ -35,6 +35,7 @@ import "Stage"; import "Timezone"; import "Wizard"; + import "PackagesUI"; string language = Language::language; @@ -619,7 +620,22 @@ } else if (Language::PackagesModified () && !Mode::config ()) { - if (!Language::PackagesInit (selected_languages)) + if (!Language::PackagesInit(selected_languages)) + { + // error message - package solver failed + Report::Error (_("There are unresolved package dependencies.")); + + // run the package selector + + // disable repomanagement during installation + boolean repomgmt = !Mode::installation(); + // start the package selector + PackagesUI::RunPackageSelector($[ "enable_repo_mgr" : repomgmt, "mode" : `summaryMode ]); + + ret = `not_next; + continue; + } + if (!Language::EnoughSpace()) { // error message Report::Error (_("There is not enough space to install all additional packages. Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Mon Nov 8 17:09:36 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Nov 8 14:24:53 UTC 2010 - lslezak(a)suse.cz + +- don't install recommended packages for already installed packages + when adding a new language (bnc#439373) +- start the package manager when there are unresolved dependencies +- 2.20.3 + +------------------------------------------------------------------- Tue Oct 19 14:41:32 CEST 2010 - jsuchome(a)suse.cz - Easter Island is in Pacific (bnc#647562) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62765 - /tags/branch-Code-11-SP1-2_17_144/network/
by mzugec＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: mzugec Date: Mon Nov 8 16:41:49 2010 New Revision: 62765 URL: http://svn.opensuse.org/viewcvs/yast?rev=62765&view=rev Log: Created tag branch-Code-11-SP1-2_17_144 for network Added: tags/branch-Code-11-SP1-2_17_144/network/ (props changed) - copied from r62764, branches/SuSE-Code-11-SP1-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62764 - /tags/branch-Code-11-SP1-2_17_144/
by mzugec＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: mzugec Date: Mon Nov 8 16:41:47 2010 New Revision: 62764 URL: http://svn.opensuse.org/viewcvs/yast?rev=62764&view=rev Log: Created tag branch-Code-11-SP1-2_17_144 Added: tags/branch-Code-11-SP1-2_17_144/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62763 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/clients/save_network.ycp src/modules/LanUdevAuto.ycp
by mzugec＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: mzugec Date: Mon Nov 8 16:41:40 2010 New Revision: 62763 URL: http://svn.opensuse.org/viewcvs/yast?rev=62763&view=rev Log: TP-L3: if possible, for temporary installation network use same device with same MAC address, even if devicename changed (bnc#648270) 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/clients/save_network.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Mon Nov 8 16:41:40 2010 @@ -1 +1 @@ -2.17.143 +2.17.144 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/netwo… ============================================================================== --- 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 8 16:41:40 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 8 16:40:34 CET 2010 - mzugec(a)suse.de + +- TP-L3: if possible, for temporary installation network use same +device with same MAC address, even if devicename changed (bnc#648270) +- 2.17.144 + +------------------------------------------------------------------- Wed Oct 27 13:28:04 CEST 2010 - mzugec(a)suse.cz - AY: when no network profile, don't change network configuration Modified: branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp Mon Nov 8 16:41:40 2010 @@ -64,6 +64,7 @@ * @return true on success */ define boolean ReadInstallInf() { + y2milestone("ReadInstallInf()"); /* Detect install.inf location */ path install_inf = nil; @@ -117,10 +118,14 @@ /* Split network device */ netdevice = InstallInf["netdevice"]:""; + y2milestone("InstallInf::netdevice:%1", netdevice); if (Mode::autoinst()){ + // if possible, for temporary installation network use same device + // with same MAC address (even if devicename changed) (bnc#648270) string new_devname = LanUdevAuto::GetDevnameByMAC(InstallInf["hwaddr"]:""); + y2milestone("LanUdevAuto::netdevice:%1", new_devname); if (size(new_devname)>0){ - y2internal("old devname: %1, new devname: %2", netdevice, new_devname); + y2milestone("old devname: %1, new devname: %2", netdevice, new_devname); netdevice=new_devname; } } Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp Mon Nov 8 16:41:40 2010 @@ -229,22 +229,16 @@ global string GetDevnameByMAC(string mac){ string devname=""; if (size(mac)>0){ - foreach(integer id, map<string, any> row, (map<integer, map <string, any> >)LanItems::Items, { - LanItems::current=id; - string name = LanItems::GetItemUdev("NAME"); - string mac_rule = LanItems::GetItemUdev("ATTR{address}"); - if (size(mac_rule)==0){ - y2error("No MAC rule %1", row); - continue; - } else - y2internal("MAC rule %1", row); - if (mac_rule==mac){ - devname=name; - y2internal("Rule matched! New devname %1", devname); - break; - } + y2milestone("MAC address from 1st stage: %1", mac); + foreach(map rule, udev_rules, { + if (rule["rule"]:""=="ATTR{address}"){ + if (mac==rule["value"]:""){ + devname=rule["name"]:""; + y2milestone("MAC address matched with device:%1", rule["name"]:""); + break; + } + } }); - } else y2warning("No MAC address to compare."); return devname; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62762 - /tags/stable-2_20_2/network/
by mzugec＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: mzugec Date: Mon Nov 8 15:49:51 2010 New Revision: 62762 URL: http://svn.opensuse.org/viewcvs/yast?rev=62762&view=rev Log: Created tag stable-2_20_2 for network Added: tags/stable-2_20_2/network/ - copied from r62761, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62761 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp src/modules/LanUdevAuto.ycp
by mzugec＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: mzugec Date: Mon Nov 8 15:49:43 2010 New Revision: 62761 URL: http://svn.opensuse.org/viewcvs/yast?rev=62761&view=rev Log: - TP-L3: if possible, for temporary installation network use same device with same MAC address, even if devicename changed (bnc#648270) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp trunk/network/src/modules/LanUdevAuto.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62761&r1=627… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Nov 8 15:49:43 2010 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Nov 8 15:49:43 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 8 15:28:20 CET 2010 - mzugec(a)suse.cz + +- TP-L3: if possible, for temporary installation network use same +device with same MAC address, even if devicename changed (bnc#648270) +- 2.20.2 + +------------------------------------------------------------------- Wed Nov 3 17:03:37 CET 2010 - mzugec(a)suse.cz - support for ordering in bonding slaves (bnc#640611) Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Mon Nov 8 15:49:43 2010 @@ -64,6 +64,7 @@ * @return true on success */ define boolean ReadInstallInf() { + y2milestone("ReadInstallInf()"); /* Detect install.inf location */ path install_inf = nil; @@ -117,10 +118,14 @@ /* Split network device */ netdevice = InstallInf["netdevice"]:""; + y2milestone("InstallInf::netdevice:%1", netdevice); if (Mode::autoinst()){ + // if possible, for temporary installation network use same device + // with same MAC address (even if devicename changed) (bnc#648270) string new_devname = LanUdevAuto::GetDevnameByMAC(InstallInf["hwaddr"]:""); + y2milestone("LanUdevAuto::netdevice:%1", new_devname); if (size(new_devname)>0){ - y2internal("old devname: %1, new devname: %2", netdevice, new_devname); + y2milestone("old devname: %1, new devname: %2", netdevice, new_devname); netdevice=new_devname; } } Modified: trunk/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanUdevAuto.… ============================================================================== --- trunk/network/src/modules/LanUdevAuto.ycp (original) +++ trunk/network/src/modules/LanUdevAuto.ycp Mon Nov 8 15:49:43 2010 @@ -229,22 +229,16 @@ global string GetDevnameByMAC(string mac){ string devname=""; if (size(mac)>0){ - foreach(integer id, map<string, any> row, (map<integer, map <string, any> >)LanItems::Items, { - LanItems::current=id; - string name = LanItems::GetItemUdev("NAME"); - string mac_rule = LanItems::GetItemUdev("ATTR{address}"); - if (size(mac_rule)==0){ - y2error("No MAC rule %1", row); - continue; - } else - y2milestone("MAC rule %1", row); - if (mac_rule==mac){ - devname=name; - y2milestone("Rule matched! New devname %1", devname); - break; - } + y2milestone("MAC address from 1st stage: %1", mac); + foreach(map rule, udev_rules, { + if (rule["rule"]:""=="ATTR{address}"){ + if (mac==rule["value"]:""){ + devname=rule["name"]:""; + y2milestone("MAC address matched with device:%1", rule["name"]:""); + break; + } + } }); - } else y2warning("No MAC address to compare."); return devname; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62760 - in /branches/SuSE-SLE-10-SP4-Branch/packager: VERSION package/yast2-packager.changes src/clients/inst_kickoff.ycp
by jsrain＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: jsrain Date: Mon Nov 8 13:50:20 2010 New Revision: 62760 URL: http://svn.opensuse.org/viewcvs/yast?rev=62760&view=rev Log: add HyperV drivers to initrd (bnc#651348) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Mon Nov 8 13:50:20 2010 @@ -1 +1 @@ -2.13.187 +2.13.188 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes Mon Nov 8 13:50:20 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 8 13:35:25 CET 2010 - jsrain(a)suse.cz + +- add HyperV drivers to initrd (bnc#651348) +- 2.13.188 + +------------------------------------------------------------------- Wed Nov 3 20:22:47 UTC 2010 - lslezak(a)suse.cz - don't reset package selection in the installation proposal when Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Mon Nov 8 13:50:20 2010 @@ -56,6 +56,30 @@ } } +void HyperVPVToInitrd() { + // can the kernel modules be loaded? + if (0 == (integer)SCR::Execute(.target.bash, "/sbin/modprobe vmbus")) + { + // add modules to initrd + Initrd::AddModule ("blkvsc", ""); + Initrd::AddModule ("netvsc", ""); + Initrd::AddModule ("storvsc", ""); + Initrd::AddModule ("vmbus", ""); + + y2milestone("Added HyperV PV drivers to initrd, configured drivers: %1", Initrd::ListModules()); + + // it also need to be added to MODULES_LOADED_ON_BOOT - not needed on SLES10 +// Kernel::AddModuleToLoad ("hv_storvsc"); +// Kernel::AddModuleToLoad ("hv_netvsc"); +// y2milestone ("Added hv_storvsc and hv_netvsc to modules loaded on boot"); + + } + else + { + y2milestone("Cannot load vmbus kernel module, skipping HyperV PV driver installation"); + } +} + /** * Write a fake mtab to the target system since some %post scripts might @@ -414,8 +438,9 @@ AcpiToInitrd (); } - // add Xen PV drivers to initrd + // add Xen and HyperV PV drivers to initrd XenPVToInitrd(); + HyperVPVToInitrd(); if (Stage::initial ()) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62759 - /branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp
by jsrain＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: jsrain Date: Mon Nov 8 10:57:41 2010 New Revision: 62759 URL: http://svn.opensuse.org/viewcvs/yast?rev=62759&view=rev Log: update fstab options (bnc#649497) Modified: branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp Modified: branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp (original) +++ branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp Mon Nov 8 10:57:41 2010 @@ -5178,6 +5178,25 @@ } } +global define void UpdateFstabOptions() { + y2milestone( "UpdateFstabOptions" ); + string tabpath = PathToDestdir( "/etc/fstab" ); + map fstab = Partitions::GetFstab( tabpath ); + integer line = 0; + string n = ""; + while( line<=AsciiFile::NumLines( fstab ) ) + { + map l = AsciiFile::GetLine( fstab, line ); + string options = l["fields", 3]:""; + if (regexpmatch (options, "^$.*,$\?hotplug$,.*$\?$")) { + options = regexpsub (options, "^$.*,$\?hotplug$,.*$\?$", "\\1nofail\\2"); + AsciiFile::ChangeLineField( fstab, line, 3, options ); + } + line = line+1; + } + AsciiFile::RewriteFile( fstab, tabpath ); +} + global string HdToIseries( string input ) ``{ string ret = input; @@ -5564,6 +5583,10 @@ UpdateFstabPersistentNames(); } + + // FIXME: proper fix + UpdateFstabOptions(); + // remove EVMS // FIXME add appropriate condition if needed (does not seem so) UpdateFstabEvms2Lvm(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62758 - /tags/stable-2_21_81/gtk/
by rpmcruz＠svn2.opensuse.org 06 Nov '10

06 Nov '10

Author: rpmcruz Date: Sat Nov 6 01:31:57 2010 New Revision: 62758 URL: http://svn.opensuse.org/viewcvs/yast?rev=62758&view=rev Log: Created tag stable-2_21_81 for gtk Added: tags/stable-2_21_81/gtk/ - copied from r62757, trunk/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62757 - /tags/stable-2_21_81/
by rpmcruz＠svn2.opensuse.org 06 Nov '10

06 Nov '10

Author: rpmcruz Date: Sat Nov 6 01:31:50 2010 New Revision: 62757 URL: http://svn.opensuse.org/viewcvs/yast?rev=62757&view=rev Log: Created tag stable-2_21_81 Added: tags/stable-2_21_81/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62756 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 06 Nov '10

06 Nov '10

Author: rpmcruz Date: Sat Nov 6 01:31:43 2010 New Revision: 62756 URL: http://svn.opensuse.org/viewcvs/yast?rev=62756&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62756&r1=62755&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Sat Nov 6 01:31:43 2010 @@ -1 +1 @@ -2.21.80 +2.21.81 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62756&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Sat Nov 6 01:31:43 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "80") +SET(VERSION_PATCH "81") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Sat Nov 6 01:31:43 2010 @@ -1,6 +1,12 @@ ------------------------------------------------------------------- Mon Nov 01 16:49:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt +- 2.21.81 +- fix build for 11.2 (added cmake requirement version). + +------------------------------------------------------------------- +Mon Nov 01 16:49:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + - 2.21.80 - fix: show the software manager header bar. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62755 - /tags/stable-2_20_3/yast2/
by lslezak＠svn2.opensuse.org 05 Nov '10

05 Nov '10

Author: lslezak Date: Fri Nov 5 14:01:35 2010 New Revision: 62755 URL: http://svn.opensuse.org/viewcvs/yast?rev=62755&view=rev Log: Created tag stable-2_20_3 for yast2 Added: tags/stable-2_20_3/yast2/ (props changed) - copied from r62754, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62754 - in /trunk/yast2: VERSION library/packages/src/PackageCallbacks.ycp package/yast2.changes
by lslezak＠svn2.opensuse.org 05 Nov '10

05 Nov '10

Author: lslezak Date: Fri Nov 5 14:00:44 2010 New Revision: 62754 URL: http://svn.opensuse.org/viewcvs/yast?rev=62754&view=rev Log: - PackageCallbacks: removed the retry/abort/skip dialog from DoneProvide callback - the user is asked via MediaChange callback, don't ask twice when aborting. - 2.20.3 Modified: trunk/yast2/VERSION trunk/yast2/library/packages/src/PackageCallbacks.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=62754&r1=62753… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Nov 5 14:00:44 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Fri Nov 5 14:00:44 2010 @@ -318,141 +318,9 @@ CommandLine::PrintVerboseNoCR(clear_string); } - if (provide_aborted) - { - provide_aborted = false; - return "C"; - } - if (error != 0) { - // this is for error code 1 ("NOT_FOUND"), %1 is name of a package - string message = sformat (_("Package %1 was not found on the medium."), name); - - // "IO" - if (error == 2) - { - // error message, %1 is a package name - message = sformat(_("Package %1 could not be downloaded (input/output error)."), name); - } - // "INVALID" - else if (error == 3) - { - // error message, %1 is a package name - message = sformat(_("Package %1 is broken, integrity check has failed."), name); - } - - - if (Mode::commandline()) { - CommandLine::Print(message); - - // ask user in the interactive mode - if (CommandLine::Interactive()) - { - CommandLine::Print(""); - - // command line mode - ask user whether installation of the failed package should be retried - CommandLine::Print(_("Retry installation of the package?")); - - if (CommandLine::YesNo()) - { - // return Retry - return "R"; - } - - // command line mode - ask user whether the installation should be aborted - CommandLine::Print(_("Abort the installation?")); - if (CommandLine::YesNo()) - { - // return Abort - return "C"; - } - - // otherwise return Ignore (default) - return "I"; - } - - return "I"; - } - - term button_box = `ButtonBox ( - `PushButton (`id(`abort), `opt (`cancelButton, `key_F9), Label::AbortButton()), - `PushButton (`id(`retry), `opt (`customButton), Label::RetryButton()), - `PushButton (`id(`ignore), `opt (`okButton), Label::SkipButton()) - ); - - if ( showLongInfo ) - { - UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) ); - UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), sformat (_("Error: %1:"), error) + reason) ); - } - else - { - UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, vsize_no_details, false) ); - UI::ReplaceWidget(`id(`info), `Empty() ); - } - - any r = nil; - - repeat - { - r = UI::UserInput(); - if ( r == `show ) - { - showLongInfo = ShowLogInfo (message, button_box); - if (showLongInfo) - { - string error_symbol = "ERROR"; - - if (error == 1) - { - error_symbol = "NOT_FOUND"; - } - else if (error == 2) - { - error_symbol = "IO"; - } - else if (error == 3) - { - error_symbol = "INVALID"; - } - - UI::ReplaceWidget(`id(`info), - `RichText (`opt(`plainText), - // error message, %1 is code of the error, - // detail string is appended to the end - sformat (_("Error: %1:"), error_symbol) + reason) ); - } - else - { - UI::ReplaceWidget(`id(`info), `Empty() ); - } - } - } until (r == `abort || r == `retry || r == `ignore); - - y2milestone ("DoneProvide %1", r); - - UI::CloseDialog(); - - if (r == `abort) - return "C"; - if (r == `retry) - return "R"; - if (r == `ignore) - { - // don't show the warning when a refresh fails - if (!autorefreshing) - { - // TODO: add "Don't show again" checkbox - // a warning popup displayed after pressing [Ignore] after a download error - Popup::Warning(_("Ignoring a download failure may result in a broken system. -The system should be later verified by running the Software Management module.")); - } - - return "I"; - } - - y2error("Unknown user input: %1", r); + return "C"; } return "I"; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Nov 5 14:00:44 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 5 12:40:03 UTC 2010 - lslezak(a)suse.cz + +- PackageCallbacks: removed the retry/abort/skip dialog from + DoneProvide callback - the user is asked via MediaChange + callback, don't ask twice when aborting. +- 2.20.3 + +------------------------------------------------------------------- Tue Nov 2 15:09:00 UTC 2010 - lslezak(a)suse.cz - updated to match the changed StartPackage callback signature -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62753 - in /branches/tmp/jsrain/unattended-migration/iscsi-client/src: IscsiClient.ycp iscsi-client_auto.ycp
by jsrain＠svn2.opensuse.org 05 Nov '10

05 Nov '10

Author: jsrain Date: Fri Nov 5 07:56:22 2010 New Revision: 62753 URL: http://svn.opensuse.org/viewcvs/yast?rev=62753&view=rev Log: fixes for unattended migration Modified: branches/tmp/jsrain/unattended-migration/iscsi-client/src/IscsiClient.ycp branches/tmp/jsrain/unattended-migration/iscsi-client/src/iscsi-client_auto.ycp Modified: branches/tmp/jsrain/unattended-migration/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/iscsi-client/src/IscsiClient.ycp (original) +++ branches/tmp/jsrain/unattended-migration/iscsi-client/src/IscsiClient.ycp Fri Nov 5 07:56:22 2010 @@ -230,12 +230,12 @@ /* Progress stage 2/2 */ _("Set up service status") ]; - if (!Mode::autoinst()) descr=remove(descr, 0); + if (!(Mode::autoinst() || Mode::autoupgrade())) descr=remove(descr, 0); // TODO FIXME Names of real stages // We do not set help text here, because it was set outside Progress::New(caption, " ", size(descr), descr, [], ""); - if (Mode::autoinst()){ + if (Mode::autoinst() || Mode::autoupgrade()){ if(Abort()) return false; Progress::NextStage(); IscsiClientLib::autoyastPrepare(); Modified: branches/tmp/jsrain/unattended-migration/iscsi-client/src/iscsi-client_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/iscsi-client/src/iscsi-client_auto.ycp (original) +++ branches/tmp/jsrain/unattended-migration/iscsi-client/src/iscsi-client_auto.ycp Fri Nov 5 07:56:22 2010 @@ -88,6 +88,7 @@ boolean progress_orig = Progress::set (false); IscsiClient::write_only = true; ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); + IscsiClientLib::autoyastPrepare(); SCR::Execute(.background.run_output_err, "iscsid"); ret = IscsiClient::Write(); Progress::set (progress_orig); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62752 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/OnlineUpdateCallbacks.ycp yast2-online-update.spec.in
by lslezak＠svn2.opensuse.org 04 Nov '10

04 Nov '10

Author: lslezak Date: Thu Nov 4 22:38:09 2010 New Revision: 62752 URL: http://svn.opensuse.org/viewcvs/yast?rev=62752&view=rev Log: - updated to match the changed StartPackage callback signature - 2.20.1 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/OnlineUpdateCallbacks.ycp trunk/online-update/yast2-online-update.spec.in Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=62752&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Thu Nov 4 22:38:09 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Thu Nov 4 22:38:09 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 2 14:52:22 UTC 2010 - lslezak(a)suse.cz + +- updated to match the changed StartPackage callback signature +- 2.20.1 + +------------------------------------------------------------------- Tue Oct 5 10:47:00 UTC 2010 - lslezak(a)suse.cz - install yast2-online-update-configuration package if needed Modified: trunk/online-update/src/OnlineUpdateCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/OnlineUpdateCa… ============================================================================== --- trunk/online-update/src/OnlineUpdateCallbacks.ycp (original) +++ trunk/online-update/src/OnlineUpdateCallbacks.ycp Thu Nov 4 22:38:09 2010 @@ -121,7 +121,7 @@ /** Callback for starting installation of a package. */ - global void StartPackage(string name, string summary, integer + global void StartPackage(string pkg_name, string name, string summary, integer installsize, boolean is_delete) { // progress log action (what is being done with the package) Modified: trunk/online-update/yast2-online-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/yast2-online-updat… ============================================================================== --- trunk/online-update/yast2-online-update.spec.in (original) +++ trunk/online-update/yast2-online-update.spec.in Thu Nov 4 22:38:09 2010 @@ -5,8 +5,8 @@ License: GPL v2 or later BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files pkg-config yast2-devtools yast2-packager yast2-bootloader PreReq: grep sed -# Pkg::GetSolverFlags, Pkg::SetSolverFlags -Requires: yast2-pkg-bindings >= 2.17.31 +# changed StartPackage callback signature +Requires: yast2-pkg-bindings >= 2.20.3 # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 # PackageCallbacks::FormatPatchName -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62751 - in /branches/SuSE-Code-11-SP2-Branch/packager: package/yast2-packager.changes src/clients/software_proposal.ycp
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 22:05:38 2010 New Revision: 62751 URL: http://svn.opensuse.org/viewcvs/yast?rev=62751&view=rev Log: - don't reset package selection in the installation proposal when partitioning is changed (bnc#450786, bnc#371875) Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes Wed Nov 3 22:05:38 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 3 20:22:47 UTC 2010 - lslezak(a)suse.cz + +- don't reset package selection in the installation proposal when + partitioning is changed (bnc#450786, bnc#371875) + +------------------------------------------------------------------- Wed Nov 3 13:44:55 UTC 2010 - lslezak(a)suse.cz - don't reset package selection in dirinstall mode when target Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp Wed Nov 3 22:05:38 2010 @@ -69,7 +69,14 @@ add (Pkg::GetAdditionalLocales (), Language::language)); } - if ( language_changed || partition_changed ) + // if only partitioning has been changed just return the current state, + // don't reset to default (bnc#450786, bnc#371875) + if (partition_changed && !language_changed && !force_reset) + { + return Packages::Summary ([ `product, `pattern, `selection, `size, `desktop ], false); + } + + if ( language_changed ) { reinit = true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62750 - /tags/branch-SLE-10-SP4-2_13_187/packager/
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 21:45:41 2010 New Revision: 62750 URL: http://svn.opensuse.org/viewcvs/yast?rev=62750&view=rev Log: Created tag branch-SLE-10-SP4-2_13_187 for packager Added: tags/branch-SLE-10-SP4-2_13_187/packager/ (props changed) - copied from r62749, branches/SuSE-SLE-10-SP4-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62749 - /tags/branch-SLE-10-SP4-2_13_187/
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 21:45:39 2010 New Revision: 62749 URL: http://svn.opensuse.org/viewcvs/yast?rev=62749&view=rev Log: Created tag branch-SLE-10-SP4-2_13_187 Added: tags/branch-SLE-10-SP4-2_13_187/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62748 - in /branches/SuSE-SLE-10-SP4-Branch/packager: VERSION package/yast2-packager.changes src/clients/software_proposal.ycp
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 21:45:32 2010 New Revision: 62748 URL: http://svn.opensuse.org/viewcvs/yast?rev=62748&view=rev Log: - don't reset package selection in the installation proposal when partitioning is changed (bnc#450786, bnc#371875) - 2.13.187 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/software_proposal.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Wed Nov 3 21:45:32 2010 @@ -1 +1 @@ -2.13.186 +2.13.187 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes Wed Nov 3 21:45:32 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 3 20:22:47 UTC 2010 - lslezak(a)suse.cz + +- don't reset package selection in the installation proposal when + partitioning is changed (bnc#450786, bnc#371875) +- 2.13.187 + +------------------------------------------------------------------- Wed Oct 6 17:48:40 UTC 2010 - lslezak(a)suse.cz - put the Linuxrc CD/DVD device to the beginning of the CD/DVD Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/software_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/software_proposal.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/software_proposal.ycp Wed Nov 3 21:45:32 2010 @@ -50,7 +50,14 @@ add (Pkg::GetAdditionalLocales (), Language::language)); } - if ( language_changed || partition_changed ) + // if only partitioning has been changed just return the current state, + // don't reset to default (bnc#450786, bnc#371875) + if (partition_changed && !language_changed && !force_reset) + { + return Packages::Summary ([ `product, `pattern, `selection, `size, `desktop ], false); + } + + if ( language_changed ) { reinit = true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62747 - /tags/stable-2_20_1/firstboot/
by jsuchome＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: jsuchome Date: Wed Nov 3 17:13:03 2010 New Revision: 62747 URL: http://svn.opensuse.org/viewcvs/yast?rev=62747&view=rev Log: Created tag stable-2_20_1 for firstboot Added: tags/stable-2_20_1/firstboot/ - copied from r62746, trunk/firstboot/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62746 - in /trunk/firstboot: VERSION package/yast2-firstboot.changes src/firstboot_language.ycp src/firstboot_language_keyboard.ycp
by jsuchome＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: jsuchome Date: Wed Nov 3 17:12:56 2010 New Revision: 62746 URL: http://svn.opensuse.org/viewcvs/yast?rev=62746&view=rev Log: - translate bootloader items after setting the language (bnc#644062) - 2.20.1 Modified: trunk/firstboot/VERSION trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/firstboot_language.ycp trunk/firstboot/src/firstboot_language_keyboard.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=62746&r1=6… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Wed Nov 3 17:12:56 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Wed Nov 3 17:12:56 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 3 17:11:19 CET 2010 - jsuchome(a)suse.cz + +- translate bootloader items after setting the language (bnc#644062) +- 2.20.1 + +------------------------------------------------------------------- Wed Nov 3 16:27:19 CET 2010 - jsuchome(a)suse.cz - fix FIRSTBOOT_FINISH_FILE behavior and documentation (bnc#615146) Modified: trunk/firstboot/src/firstboot_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_language… ============================================================================== --- trunk/firstboot/src/firstboot_language.ycp (original) +++ trunk/firstboot/src/firstboot_language.ycp Wed Nov 3 17:12:56 2010 @@ -20,6 +20,7 @@ import "Console"; import "Directory"; + import "GfxMenu"; import "Language"; import "Wizard"; import "Firstboot"; @@ -104,6 +105,11 @@ If necessary, you may want to adapt your keyboard settings to the new language. Use keyboard layout configuration tool after the login.")); } + + // update bootloader menu + Language::WfmSetLanguage(); + GfxMenu::Update(); + } else { Modified: trunk/firstboot/src/firstboot_language_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_language… ============================================================================== --- trunk/firstboot/src/firstboot_language_keyboard.ycp (original) +++ trunk/firstboot/src/firstboot_language_keyboard.ycp Wed Nov 3 17:12:56 2010 @@ -21,6 +21,7 @@ import "Console"; import "Directory"; import "GetInstArgs"; + import "GfxMenu"; import "Keyboard"; import "Label"; import "Language"; @@ -200,6 +201,8 @@ Keyboard::Save (); Timezone::Save (); Console::Save (); + // update bootloader menu items + GfxMenu::Update(); } return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62745 - /tags/branch-Code-11-SP1-2_17_16/firstboot/
by jsuchome＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: jsuchome Date: Wed Nov 3 17:12:18 2010 New Revision: 62745 URL: http://svn.opensuse.org/viewcvs/yast?rev=62745&view=rev Log: Created tag branch-Code-11-SP1-2_17_16 for firstboot Added: tags/branch-Code-11-SP1-2_17_16/firstboot/ (props changed) - copied from r62744, branches/SuSE-Code-11-SP1-Branch/firstboot/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62744 - in /branches/SuSE-Code-11-SP1-Branch/firstboot: VERSION package/yast2-firstboot.changes src/firstboot_language.ycp src/firstboot_language_keyboard.ycp
by jsuchome＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: jsuchome Date: Wed Nov 3 17:11:56 2010 New Revision: 62744 URL: http://svn.opensuse.org/viewcvs/yast?rev=62744&view=rev Log: - translate bootloader items after setting the language (bnc#644062) - 2.17.16 Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language.ycp branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION Wed Nov 3 17:11:56 2010 @@ -1 +1 @@ -2.17.15 +2.17.16 Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes Wed Nov 3 17:11:56 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 27 09:51:32 CEST 2010 - jsuchome(a)suse.cz + +- translate bootloader items after setting the language (bnc#644062) +- 2.17.16 + +------------------------------------------------------------------- Fri Apr 9 09:50:51 CEST 2010 - jsuchome(a)suse.cz - added some default values and comments to firstboot.xml Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language.ycp Wed Nov 3 17:11:56 2010 @@ -20,6 +20,7 @@ import "Console"; import "Directory"; + import "GfxMenu"; import "Language"; import "Wizard"; import "Firstboot"; @@ -108,6 +109,11 @@ // (default change of layout was done based on language) SCR::Execute (.target.bash, sformat ("touch %1/firstboot_x11_save", Directory::vardir)); } + + // update bootloader menu + Language::WfmSetLanguage(); + GfxMenu::Update(); + } else { Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp Wed Nov 3 17:11:56 2010 @@ -21,6 +21,7 @@ import "Console"; import "Directory"; import "GetInstArgs"; + import "GfxMenu"; import "Keyboard"; import "Label"; import "Language"; @@ -200,6 +201,8 @@ Keyboard::Save (true); Timezone::Save (); Console::Save (); + // update bootloader menu items + GfxMenu::Update(); } return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62743 - /tags/stable-2_20_0/firstboot/
by jsuchome＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: jsuchome Date: Wed Nov 3 17:10:17 2010 New Revision: 62743 URL: http://svn.opensuse.org/viewcvs/yast?rev=62743&view=rev Log: Created tag stable-2_20_0 for firstboot Added: tags/stable-2_20_0/firstboot/ - copied from r62742, trunk/firstboot/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62742 - in /trunk/firstboot: VERSION doc/firstboot-section_mod.xml package/yast2-firstboot.changes src/data/sysconfig.firstboot src/firstboot_finish.ycp
by jsuchome＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: jsuchome Date: Wed Nov 3 17:09:56 2010 New Revision: 62742 URL: http://svn.opensuse.org/viewcvs/yast?rev=62742&view=rev Log: - fix FIRSTBOOT_FINISH_FILE behavior and documentation (bnc#615146) - 2.20.0 Modified: trunk/firstboot/VERSION trunk/firstboot/doc/firstboot-section_mod.xml trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/data/sysconfig.firstboot trunk/firstboot/src/firstboot_finish.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=62742&r1=6… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Wed Nov 3 17:09:56 2010 @@ -1 +1 @@ -2.19.5 +2.20.0 Modified: trunk/firstboot/doc/firstboot-section_mod.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/doc/firstboot-section_… ============================================================================== --- trunk/firstboot/doc/firstboot-section_mod.xml (original) +++ trunk/firstboot/doc/firstboot-section_mod.xml Wed Nov 3 17:09:56 2010 @@ -147,8 +147,8 @@ </para> <para> - If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead - of inst_finish. The recommended way of customizing the congratulate text is specifying it in the firstboot.xml control file. + If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead of inst_congratulate. The content of the given file would be shown as the final text. + However the recommended way of customizing the congratulate text is using default inst_congratulate step and specifying the text (as a value for 'congratulate' section) it in the firstboot.xml control file (see control.xml examples and documentation). </para> </section> Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Wed Nov 3 17:09:56 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 3 16:27:19 CET 2010 - jsuchome(a)suse.cz + +- fix FIRSTBOOT_FINISH_FILE behavior and documentation (bnc#615146) +- 2.20.0 + +------------------------------------------------------------------- Fri Apr 23 16:22:45 CEST 2010 - ug(a)suse.de - desktop file fixed Modified: trunk/firstboot/src/data/sysconfig.firstboot URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/data/sysconfig.fir… ============================================================================== --- trunk/firstboot/src/data/sysconfig.firstboot (original) +++ trunk/firstboot/src/data/sysconfig.firstboot Wed Nov 3 17:09:56 2010 @@ -46,9 +46,9 @@ ## Type: string ## Default: "" # -# finish text file +# finish text file, containing the finish text in richtext format # enable firstboot_finish instead of inst_finish in the control file -# preffered way is to define the text in the control file +# (but preffered way is to define the text in the control file) FIRSTBOOT_FINISH_FILE="" ## Type: yesno Modified: trunk/firstboot/src/firstboot_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_finish.y… ============================================================================== --- trunk/firstboot/src/firstboot_finish.ycp (original) +++ trunk/firstboot/src/firstboot_finish.ycp Wed Nov 3 17:09:56 2010 @@ -12,6 +12,7 @@ { textdomain "firstboot"; + import "FileUtils"; import "Misc"; import "Mode"; import "Wizard"; @@ -63,10 +64,15 @@ _("Have a lot of fun! Your SuSE Development Team"); - // If text exists, read it from file instead. - string finish_text = Misc::SysconfigRead ( + // If text exists, read it from file instead; it is expected to be richtext. + string finish_text = ""; + string finish_text_file = Misc::SysconfigRead ( .sysconfig.firstboot.FIRSTBOOT_FINISH_FILE, ""); - if (finish_text == "") + if (finish_text_file != "" && FileUtils::Exists (finish_text_file)) + { + finish_text = (string)SCR::Read (.target.string, finish_text_file); + } + if (finish_text == nil || finish_text == "") finish_text = text; term contents = `VBox ( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62741 - /tags/stable-2_20_1/network/
by mzugec＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: mzugec Date: Wed Nov 3 17:09:10 2010 New Revision: 62741 URL: http://svn.opensuse.org/viewcvs/yast?rev=62741&view=rev Log: Created tag stable-2_20_1 for network Added: tags/stable-2_20_1/network/ - copied from r62740, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62740 - /trunk/network/VERSION
by mzugec＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: mzugec Date: Wed Nov 3 17:09:00 2010 New Revision: 62740 URL: http://svn.opensuse.org/viewcvs/yast?rev=62740&view=rev Log: increased version Modified: trunk/network/VERSION Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62740&r1=627… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Nov 3 17:09:00 2010 @@ -1 +1 @@ -2.19.42 +2.20.1 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62739 - /tags/stable-2_19_42/network/
by mzugec＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: mzugec Date: Wed Nov 3 17:08:00 2010 New Revision: 62739 URL: http://svn.opensuse.org/viewcvs/yast?rev=62739&view=rev Log: Created tag stable-2_19_42 for network Added: tags/stable-2_19_42/network/ - copied from r62738, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62738 - /tags/stable-2_19_42/
by mzugec＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: mzugec Date: Wed Nov 3 17:07:58 2010 New Revision: 62738 URL: http://svn.opensuse.org/viewcvs/yast?rev=62738&view=rev Log: Created tag stable-2_19_42 Added: tags/stable-2_19_42/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62737 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp
by mzugec＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: mzugec Date: Wed Nov 3 17:07:25 2010 New Revision: 62737 URL: http://svn.opensuse.org/viewcvs/yast?rev=62737&view=rev Log: support for ordering in bonding slaves (bnc#640611) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62737&r1=627… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Nov 3 17:07:25 2010 @@ -1 +1 @@ -2.19.41 +2.19.42 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Nov 3 17:07:25 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 3 17:03:37 CET 2010 - mzugec(a)suse.cz + +- support for ordering in bonding slaves (bnc#640611) +- 2.20.1 + +------------------------------------------------------------------- Wed Oct 27 13:53:54 CEST 2010 - mzugec(a)suse.cz - AY: when no network profile, don't change network configuration Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Wed Nov 3 17:07:25 2010 @@ -159,6 +159,27 @@ } +integer getISlaveIndex(string slave){ + list<term> items = (list<term>)UI::QueryWidget(`msbox_items, `Items); + integer index = -1; + integer pos=0; + foreach(term it, (list<term>)items, { + if(it[0, 0]:""==slave){ + index = pos; + break; + } + pos=pos+1; + }); + return index; +} + +void enableSlaveButtons(){ + list<term> items = (list<term>)UI::QueryWidget(`msbox_items, `Items); + string current = tostring(UI::QueryWidget(`msbox_items, `CurrentItem)); + integer index = getISlaveIndex(current); + UI::ChangeWidget(`up, `Enabled, index>0); + UI::ChangeWidget(`down, `Enabled, index<size(items)-1); +} /** * Default function to init the value of slave devices box. @@ -167,11 +188,11 @@ void InitSlave(string key) { settings["SLAVES"] = LanItems::bond_slaves; - UI::ChangeWidget(`id("BONDSLAVE"), `SelectedItems, settings["SLAVES"]:[]); + UI::ChangeWidget(`msbox_items, `SelectedItems, settings["SLAVES"]:[]); - settings["BONDOPTION"] = LanItems::bond_option; + settings["BONDOPTION"] = LanItems::bond_option; - list items = createUnconfigured(settings["SLAVES"]:[]); + list items = createUnconfigured(settings["SLAVES"]:[]); map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { @@ -182,8 +203,72 @@ }); }); - UI::ChangeWidget(`id(key), `Items, items); -y2internal("slaves %1", settings["SLAVES"]:[]); + // reorder the items + list l2=[]; + list l1=[]; + foreach(term t, (list<term>) items, { + if (contains(settings["SLAVES"]:[], t[0,0]:"")){ + l1=add(l1, t); + } else { + l2=add(l2, t); + } + }); + + items=[]; + foreach(string s, settings["SLAVES"]:[],{ + foreach(term t, (list<term>) l1,{ + if (t[0,0]:""==s) items=add(items, t); + }); + }); + + items=union(items,l2); + UI::ChangeWidget(`msbox_items, `Items, items); + enableSlaveButtons(); +} + +symbol HandleSlave(string key, map event) +{ + if (event["EventReason"]:"" =="SelectionChanged"){ + enableSlaveButtons(); + } else if (event["EventReason"]:""=="Activated" && event["WidgetClass"]:nil==`PushButton){ + list<term> items = (list<term>)UI::QueryWidget(`msbox_items, `Items); + string current = tostring(UI::QueryWidget(`msbox_items, `CurrentItem)); + integer index = getISlaveIndex(current); + list<term> new_items=[]; + integer pos=0; + switch(event["ID"]:`nil){ + case `up: + while(index>pos+1){ + new_items=add(new_items, items[pos]:nil); + pos=pos+1; + } + new_items=add(new_items, items[index]:nil); + new_items=add(new_items, items[index-1]:nil); + new_items=(list<term>)union(new_items, (list<term>)sublist(items, index)); + break; + case `down: + while(index>pos){ + new_items=add(new_items, items[pos]:nil); + pos=pos+1; + } + new_items=add(new_items, items[index+1]:nil); + new_items=add(new_items, items[index]:nil); + new_items=(list<term>)union(new_items, (list<term>)sublist(items, index+1)); + break; + default: + y2warning("unknown action"); + return nil; + } + items = new_items; + UI::ChangeWidget(`msbox_items, `Items, items); + enableSlaveButtons(); + + } else + { + y2debug("event:%1", event); + } + + return nil; } /** @@ -193,7 +278,7 @@ */ void StoreSlave(string key, map event) { - settings["SLAVES"] = (list<string>)UI::QueryWidget (`id(key), `SelectedItems); + settings["SLAVES"] = (list<string>)UI::QueryWidget (`msbox_items, `SelectedItems); settings["BONDOPTION"] = UI::QueryWidget (`id("BONDOPTION"), `Value); LanItems::bond_slaves = settings["SLAVES"]:[]; LanItems::bond_option = settings["BONDOPTION"]:""; @@ -656,11 +741,15 @@ "help": help["etherdevice"]:"", ], "BONDSLAVE": $[ - "widget": `multi_selection_box, + "widget": `custom, + "custom_widget" : `Frame(_("Bond Slaves and Order"), `VBox( + `MultiSelectionBox(`id(`msbox_items), `opt(`notify), "", []), + `HBox(`PushButton(`id(`up), `opt(`disabled), _("Up") ), `PushButton(`id(`down), `opt(`disabled), _("Down") ) ) + )), "label": _("Bond &Slaves"), - "opt": [`shrinkable], - "items" : [ ], +// "opt": [`shrinkable], "init": InitSlave, + "handle": HandleSlave, "store": StoreSlave, "help": help["bondslave"]:"", ], -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62736 - in /branches/SuSE-Code-11-SP2-Branch/dirinstall: package/yast2-dirinstall.changes src/clients/dirinstall_options.ycp
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 15:02:57 2010 New Revision: 62736 URL: http://svn.opensuse.org/viewcvs/yast?rev=62736&view=rev Log: - fixed package import from AutoYaST XML profile (bnc#568517) Modified: branches/SuSE-Code-11-SP2-Branch/dirinstall/package/yast2-dirinstall.changes branches/SuSE-Code-11-SP2-Branch/dirinstall/src/clients/dirinstall_options.ycp Modified: branches/SuSE-Code-11-SP2-Branch/dirinstall/package/yast2-dirinstall.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dirin… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dirinstall/package/yast2-dirinstall.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dirinstall/package/yast2-dirinstall.changes Wed Nov 3 15:02:57 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 3 13:54:23 UTC 2010 - lslezak(a)suse.cz + +- fixed package import from AutoYaST XML profile (bnc#568517) + +------------------------------------------------------------------- Fri Dec 5 14:40:20 CET 2008 - lslezak(a)suse.cz - use control.rng file for validating the dirinstall control file Modified: branches/SuSE-Code-11-SP2-Branch/dirinstall/src/clients/dirinstall_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dirin… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dirinstall/src/clients/dirinstall_options.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/dirinstall/src/clients/dirinstall_options.ycp Wed Nov 3 15:02:57 2010 @@ -135,13 +135,75 @@ && (DirInstall::autoyast_software != w_autoyast || ! DirInstall::use_autoyast_software)) { - if (! ( Profile::ReadXML( w_autoyast ) - || AutoinstSoftware::Import(Profile::current["software"]:$[]))) + if ( Profile::ReadXML( w_autoyast )) + { + // reset the current selection, start from scratch + Pkg::PkgReset(); + + map settings = Profile::current["software"]:$[]; + y2milestone("Read software data: %1", settings); + + list<string> patterns = settings["patterns"]:[]; + y2milestone("Installing patterns: %1", patterns); + foreach (string pat, patterns, { + Pkg::ResolvableInstall(pat, `pattern); + }); + + list<string> post_patterns = settings["post-patterns"]:[]; + y2milestone("Installing post-patterns: %1", patterns); + foreach (string pat, post_patterns, { + Pkg::ResolvableInstall(pat, `pattern); + }); + + list<string> packages = settings["packages"]:[]; + + string notFound = ""; + foreach(string pack, packages, { + if(!Pkg::IsAvailable(pack)) { + notFound = notFound + pack + "\n"; + } + }); + + if(size(notFound) > 0) { + y2error("packages not found: %1",notFound); + // warning text when selecting packages. %1 is a list of package names + Report::LongError( sformat(_("These packages could not be found in the software repositories:\n%1"), notFound)); + } + + string kernel = settings["kernel"]:""; + + if (kernel != nil && kernel != "") + { + y2milestone("Adding kernel package: %1", kernel); + packages = add(packages, kernel); + } + + list<string> post_packages = settings["post-packages"]:[]; + if (size(post_packages) > 0) + { + y2milestone("Merging post-packages: %1", post_packages); + packages = (list<string>)merge(packages, post_packages); + } + + y2milestone("Selecting packages: %1", packages); + Pkg::DoProvide(packages); + + list<string> taboo_packages = settings["remove-packages"]:[]; + if (size(taboo_packages) > 0) + { + y2milestone("Taboo packages: %1", taboo_packages); + foreach (string tp, taboo_packages, { + Pkg::PkgTaboo(tp); + }); + } + + y2internal("products after import: %1", Pkg::ResolvableProperties ("", `product, "")); + } + else { Report::Error (_("Failed to read the AutoYaST profile.")); continue; } - AutoinstSoftware::Write(); } DirInstall::use_autoyast_software = (boolean)UI::QueryWidget (`id (`use_autoyast), `Value); DirInstall::autoyast_software = w_autoyast; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62735 - /tags/stable-2_20_0/dirinstall/
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 15:01:21 2010 New Revision: 62735 URL: http://svn.opensuse.org/viewcvs/yast?rev=62735&view=rev Log: Created tag stable-2_20_0 for dirinstall Added: tags/stable-2_20_0/dirinstall/ - copied from r62734, trunk/dirinstall/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62734 - in /trunk/dirinstall: VERSION package/yast2-dirinstall.changes src/clients/dirinstall_options.ycp
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 14:56:36 2010 New Revision: 62734 URL: http://svn.opensuse.org/viewcvs/yast?rev=62734&view=rev Log: - fixed package import from AutoYaST XML profile (bnc#568517) - 2.20.0 Modified: trunk/dirinstall/VERSION trunk/dirinstall/package/yast2-dirinstall.changes trunk/dirinstall/src/clients/dirinstall_options.ycp Modified: trunk/dirinstall/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/VERSION?rev=62734&r1=… ============================================================================== --- trunk/dirinstall/VERSION (original) +++ trunk/dirinstall/VERSION Wed Nov 3 14:56:36 2010 @@ -1 +1 @@ -2.19.0 +2.20.0 Modified: trunk/dirinstall/package/yast2-dirinstall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/package/yast2-dirinst… ============================================================================== --- trunk/dirinstall/package/yast2-dirinstall.changes (original) +++ trunk/dirinstall/package/yast2-dirinstall.changes Wed Nov 3 14:56:36 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 3 13:54:23 UTC 2010 - lslezak(a)suse.cz + +- fixed package import from AutoYaST XML profile (bnc#568517) +- 2.20.0 + +------------------------------------------------------------------- Wed Jul 7 13:15:51 UTC 2010 - lslezak(a)suse.cz - fixed Keyboard::Save() call (bnc#574707) Modified: trunk/dirinstall/src/clients/dirinstall_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/clients/dirinstal… ============================================================================== --- trunk/dirinstall/src/clients/dirinstall_options.ycp (original) +++ trunk/dirinstall/src/clients/dirinstall_options.ycp Wed Nov 3 14:56:36 2010 @@ -135,13 +135,75 @@ && (DirInstall::autoyast_software != w_autoyast || ! DirInstall::use_autoyast_software)) { - if (! ( Profile::ReadXML( w_autoyast ) - || AutoinstSoftware::Import(Profile::current["software"]:$[]))) + if ( Profile::ReadXML( w_autoyast )) + { + // reset the current selection, start from scratch + Pkg::PkgReset(); + + map settings = Profile::current["software"]:$[]; + y2milestone("Read software data: %1", settings); + + list<string> patterns = settings["patterns"]:[]; + y2milestone("Installing patterns: %1", patterns); + foreach (string pat, patterns, { + Pkg::ResolvableInstall(pat, `pattern); + }); + + list<string> post_patterns = settings["post-patterns"]:[]; + y2milestone("Installing post-patterns: %1", patterns); + foreach (string pat, post_patterns, { + Pkg::ResolvableInstall(pat, `pattern); + }); + + list<string> packages = settings["packages"]:[]; + + string notFound = ""; + foreach(string pack, packages, { + if(!Pkg::IsAvailable(pack)) { + notFound = notFound + pack + "\n"; + } + }); + + if(size(notFound) > 0) { + y2error("packages not found: %1",notFound); + // warning text when selecting packages. %1 is a list of package names + Report::LongError( sformat(_("These packages could not be found in the software repositories:\n%1"), notFound)); + } + + string kernel = settings["kernel"]:""; + + if (kernel != nil && kernel != "") + { + y2milestone("Adding kernel package: %1", kernel); + packages = add(packages, kernel); + } + + list<string> post_packages = settings["post-packages"]:[]; + if (size(post_packages) > 0) + { + y2milestone("Merging post-packages: %1", post_packages); + packages = (list<string>)merge(packages, post_packages); + } + + y2milestone("Selecting packages: %1", packages); + Pkg::DoProvide(packages); + + list<string> taboo_packages = settings["remove-packages"]:[]; + if (size(taboo_packages) > 0) + { + y2milestone("Taboo packages: %1", taboo_packages); + foreach (string tp, taboo_packages, { + Pkg::PkgTaboo(tp); + }); + } + + y2internal("products after import: %1", Pkg::ResolvableProperties ("", `product, "")); + } + else { Report::Error (_("Failed to read the AutoYaST profile.")); continue; } - AutoinstSoftware::Write(); } DirInstall::use_autoyast_software = (boolean)UI::QueryWidget (`id (`use_autoyast), `Value); DirInstall::autoyast_software = w_autoyast; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62733 - /tags/stable-2_20_9/packager/
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 14:48:18 2010 New Revision: 62733 URL: http://svn.opensuse.org/viewcvs/yast?rev=62733&view=rev Log: Created tag stable-2_20_9 for packager Added: tags/stable-2_20_9/packager/ - copied from r62732, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62732 - /tags/stable-2_20_9/
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 14:48:16 2010 New Revision: 62732 URL: http://svn.opensuse.org/viewcvs/yast?rev=62732&view=rev Log: Created tag stable-2_20_9 Added: tags/stable-2_20_9/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62731 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 14:48:08 2010 New Revision: 62731 URL: http://svn.opensuse.org/viewcvs/yast?rev=62731&view=rev Log: - don't reset package selection in dirinstall mode when target directory is changed (bnc#568511, bnc#568512) - 2.20.9 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62731&r1=62… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Nov 3 14:48:08 2010 @@ -1 +1 @@ -2.20.8 +2.20.9 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Nov 3 14:48:08 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 3 13:44:55 UTC 2010 - lslezak(a)suse.cz + +- don't reset package selection in dirinstall mode when target + directory is changed (bnc#568511, bnc#568512) +- 2.20.9 + +------------------------------------------------------------------- Tue Nov 2 13:00:15 UTC 2010 - lslezak(a)suse.cz - correctly display download progress in DownloadInAdvance Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Wed Nov 3 14:48:08 2010 @@ -1804,6 +1804,14 @@ y2milestone("the cached proposal is empty or reset is required"); } + if (Installation::dirinstall_installing_into_dir && !force_reset && init_called) + { + return Summary ( + [ `product, `pattern, `selection, `size, `desktop ], + false + ); + } + UI::OpenDialog(`opt(`decorated ), // popup label `Label (_("Evaluating package selection..."))); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62730 - in /branches/SuSE-Code-11-SP2-Branch/packager: package/yast2-packager.changes src/modules/Packages.ycp
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 14:46:56 2010 New Revision: 62730 URL: http://svn.opensuse.org/viewcvs/yast?rev=62730&view=rev Log: - don't reset package selection in dirinstall mode when target directory is changed (bnc#568511, bnc#568512) Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes Wed Nov 3 14:46:56 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 3 13:44:55 UTC 2010 - lslezak(a)suse.cz + +- don't reset package selection in dirinstall mode when target + directory is changed (bnc#568511, bnc#568512) + +------------------------------------------------------------------- Wed Oct 27 10:14:52 CEST 2010 - mzugec(a)suse.cz - backported layout change for repository (bnc#510794) Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp Wed Nov 3 14:46:56 2010 @@ -1804,6 +1804,14 @@ y2milestone("the cached proposal is empty or reset is required"); } + if (Installation::dirinstall_installing_into_dir && !force_reset && init_called) + { + return Summary ( + [ `product, `pattern, `selection, `size, `desktop ], + false + ); + } + UI::OpenDialog(`opt(`decorated ), // popup label `Label (_("Evaluating package selection..."))); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62729 - in /branches/SuSE-Code-11-SP2-Branch: dirinstall/ packager/
by lslezak＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: lslezak Date: Wed Nov 3 14:43:49 2010 New Revision: 62729 URL: http://svn.opensuse.org/viewcvs/yast?rev=62729&view=rev Log: copied dirinstall and packager from SP1 branch Added: branches/SuSE-Code-11-SP2-Branch/dirinstall/ (props changed) - copied from r62728, branches/SuSE-Code-11-SP1-Branch/dirinstall/ branches/SuSE-Code-11-SP2-Branch/packager/ (props changed) - copied from r62728, branches/SuSE-Code-11-SP1-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62728 - /trunk/mail/src/YaPI/MailServer.pm
by varkoly＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: varkoly Date: Wed Nov 3 12:40:51 2010 New Revision: 62728 URL: http://svn.opensuse.org/viewcvs/yast?rev=62728&view=rev Log: Add SLES11 as capability Modified: trunk/mail/src/YaPI/MailServer.pm Modified: trunk/mail/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=… ============================================================================== --- trunk/mail/src/YaPI/MailServer.pm (original) +++ trunk/mail/src/YaPI/MailServer.pm Wed Nov 3 12:40:51 2010 @@ -42,7 +42,8 @@ textdomain("mail"); our %TYPEINFO; our @CAPABILITIES = ( - 'SLES10' + 'SLES10', + 'SLES11' ); our $VERSION="2.2.0"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62727 - /branches/tmp/jsrain/unattended-migration/update/src/include/rootpart.ycp
by jsrain＠svn2.opensuse.org 03 Nov '10

03 Nov '10

Author: jsrain Date: Wed Nov 3 10:57:37 2010 New Revision: 62727 URL: http://svn.opensuse.org/viewcvs/yast?rev=62727&view=rev Log: enable Abort button when selecting system to upgrade (bnc#645429) Modified: branches/tmp/jsrain/unattended-migration/update/src/include/rootpart.ycp Modified: branches/tmp/jsrain/unattended-migration/update/src/include/rootpart.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/update/src/include/rootpart.ycp (original) +++ branches/tmp/jsrain/unattended-migration/update/src/include/rootpart.ycp Wed Nov 3 10:57:37 2010 @@ -20,6 +20,7 @@ import "Report"; import "Update"; import "Installation"; +import "Mode"; // Returns boolean whether partition can be // a Linux 'root' file system @@ -222,6 +223,8 @@ if (flavor == `update_dialog) { Wizard::SetContents (title, contents, help_text, true, true); + if (Mode::autoupgrade()) + Wizard::EnableAbortButton(); } else if (flavor == `update_dialog_proposal) { @@ -285,6 +288,8 @@ else ret = UI::UserInput (); + if (ret == `cancel) + ret = `abort; if (ret == `abort && Popup::ConfirmAbort (`painless)) break; @@ -371,6 +376,8 @@ if (flavor != `update_dialog) UI::CloseDialog (); + else if (Mode::autoupgrade()) + Wizard::DisableAbortButton(); // New partition has been mounted if (flavor == `update_dialog && ret == `next) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62726 - /tags/branch-SLE-10-SP4-2_13_167/bootloader/
by jreidinger＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: jreidinger Date: Tue Nov 2 19:06:27 2010 New Revision: 62726 URL: http://svn.opensuse.org/viewcvs/yast?rev=62726&view=rev Log: Created tag branch-SLE-10-SP4-2_13_167 for bootloader Added: tags/branch-SLE-10-SP4-2_13_167/bootloader/ - copied from r62725, branches/SuSE-SLE-10-SP4-Branch/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62725 - /tags/branch-SLE-10-SP4-2_13_167/
by jreidinger＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: jreidinger Date: Tue Nov 2 19:06:25 2010 New Revision: 62725 URL: http://svn.opensuse.org/viewcvs/yast?rev=62725&view=rev Log: Created tag branch-SLE-10-SP4-2_13_167 Added: tags/branch-SLE-10-SP4-2_13_167/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62724 - /branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION
by jreidinger＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: jreidinger Date: Tue Nov 2 19:06:18 2010 New Revision: 62724 URL: http://svn.opensuse.org/viewcvs/yast?rev=62724&view=rev Log: version update Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION Tue Nov 2 19:06:18 2010 @@ -1 +1 @@ -2.13.166 +2.13.167 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62723 - in /branches/SuSE-SLE-10-SP4-Branch/bootloader: package/yast2-bootloader.changes src/routines/misc.ycp
by jreidinger＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: jreidinger Date: Tue Nov 2 19:05:58 2010 New Revision: 62723 URL: http://svn.opensuse.org/viewcvs/yast?rev=62723&view=rev Log: Fix detection of HyperV as during install there is not lscpu utility (bnc#650780) Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes Tue Nov 2 19:05:58 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 2 18:04:50 UTC 2010 - jreidinger(a)novell.com + +- Fix detection of HyperV as during install there is not lscpu + utility (bnc#650780) +- 2.13.167 + +------------------------------------------------------------------- Fri Oct 22 10:12:58 UTC 2010 - jreidinger(a)novell.com - add detection of HyperV and boot parameter for it (FATE#309005) Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp Tue Nov 2 19:05:58 2010 @@ -2009,10 +2009,9 @@ boolean xen = (boolean)SCR::Read(.probe.is_xen); // check if it is HVM guest only if ((!Arch::is_xen()) && (xen == true)) - ret = true; - string hyperV = ((map<string, any>)SCR::Execute(.target.bash_output, - "lscpu | grep -c '^Hypervisor vendor:[[:blank:]]*Microsoft$'"))["stdout"]:"0"; - if (hyperV == "1") //TODO convert to int + ret = true; + integer hyperV = (integer)SCR::Execute(.target.bash, "/sbin/modprobe vmbus"); + if (hyperV == 0) //module can be loaded, so we are in HyperV (bnc#650780) ret = true; return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62722 - /tags/stable-2_20_2/yast2/
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 16:10:57 2010 New Revision: 62722 URL: http://svn.opensuse.org/viewcvs/yast?rev=62722&view=rev Log: Created tag stable-2_20_2 for yast2 Added: tags/stable-2_20_2/yast2/ (props changed) - copied from r62721, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62721 - in /trunk/yast2: VERSION library/packages/src/PackageCallbacks.ycp package/yast2.changes yast2.spec.in
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 16:09:53 2010 New Revision: 62721 URL: http://svn.opensuse.org/viewcvs/yast?rev=62721&view=rev Log: - updated to match the changed StartPackage callback signature - 2.20.2 Modified: trunk/yast2/VERSION trunk/yast2/library/packages/src/PackageCallbacks.ycp trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=62721&r1=62720… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Nov 2 16:09:53 2010 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Tue Nov 2 16:09:53 2010 @@ -475,23 +475,13 @@ /** * At start of package install. */ - global void StartPackage (string name, string summary, integer + global void StartPackage (string name, string location, string summary, integer installsize, boolean is_delete) { if (!enable_asterix_package) return; - list<string> parsed_path = splitstring(name, "/"); - - if (size(parsed_path) > 0) - { - _package_name = parsed_path[size(parsed_path) - 1]:""; - } - else - { - _package_name = name; - } - + _package_name = name; _package_size = installsize; _deleting_package = is_delete; string sz = String::FormatSizeWithPrecision (installsize, 2, false); @@ -2973,7 +2963,7 @@ string DummyDoneProvide (integer error, string reason, string name) {y2debug("Empty DoneProvide callback, returning 'I'");return "I";} -void DummyStartPackage (string name, string summary, integer installsize, boolean is_delete) {y2debug("Empty StartPackage callback");} +void DummyStartPackage (string name, string location, string summary, integer installsize, boolean is_delete) {y2debug("Empty StartPackage callback");} string DummyDonePackage (integer error, string reason) {y2debug("Empty DonePackage callback, returning 'I'");return "I";} Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Nov 2 16:09:53 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 2 15:09:00 UTC 2010 - lslezak(a)suse.cz + +- updated to match the changed StartPackage callback signature +- 2.20.2 + +------------------------------------------------------------------- Mon Oct 18 15:04:37 UTC 2010 - lslezak(a)suse.cz - don't display extra error popup when a download fails, the error Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=62721&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Tue Nov 2 16:09:53 2010 @@ -7,7 +7,7 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-perl-bindings # Needed already in build time -BuildRequires: yast2-pkg-bindings >= 2.17.32 yast2-core >= 2.18.12 yast2-ycp-ui-bindings >= 2.18.4 +BuildRequires: yast2-pkg-bindings >= 2.20.3 yast2-core >= 2.18.12 yast2-ycp-ui-bindings >= 2.18.4 # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq @@ -18,8 +18,8 @@ # new UI::OpenContextMenu Requires: yast2-ycp-ui-bindings >= 2.18.4 -# Pkg::Get(Set)SolverFlags() -Requires: yast2-pkg-bindings >= 2.17.32 +# changed StartPackage callback signature +Requires: yast2-pkg-bindings >= 2.20.3 Requires: yast2_ui yast2-branding # For Cron Agent, Module Requires: perl-Config-Crontab -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62720 - /tags/stable-2_20_1/online-update/
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:54:33 2010 New Revision: 62720 URL: http://svn.opensuse.org/viewcvs/yast?rev=62720&view=rev Log: Created tag stable-2_20_1 for online-update Added: tags/stable-2_20_1/online-update/ - copied from r62719, trunk/online-update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62719 - /tags/stable-2_20_8/packager/
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:49:55 2010 New Revision: 62719 URL: http://svn.opensuse.org/viewcvs/yast?rev=62719&view=rev Log: Created tag stable-2_20_8 for packager Added: tags/stable-2_20_8/packager/ - copied from r62718, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62718 - /tags/stable-2_20_8/
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:49:49 2010 New Revision: 62718 URL: http://svn.opensuse.org/viewcvs/yast?rev=62718&view=rev Log: Created tag stable-2_20_8 Added: tags/stable-2_20_8/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62717 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/PackageSlideShow.ycp src/modules/SlideShowCallbacks.ycp yast2-packager.spec.in
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:49:08 2010 New Revision: 62717 URL: http://svn.opensuse.org/viewcvs/yast?rev=62717&view=rev Log: - correctly collect package installation log in DownloadInAdvance libzypp mode - 2.20.8 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageSlideShow.ycp trunk/packager/src/modules/SlideShowCallbacks.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62717&r1=62… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Nov 2 15:49:08 2010 @@ -1 +1 @@ -2.20.7 +2.20.8 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Nov 2 15:49:08 2010 @@ -3,6 +3,7 @@ - correctly display download progress in DownloadInAdvance libzypp mode (bnc#616708) +- 2.20.8 ------------------------------------------------------------------- Mon Nov 1 16:30:27 UTC 2010 - lslezak(a)suse.cz Modified: trunk/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageSlid… ============================================================================== --- trunk/packager/src/modules/PackageSlideShow.ycp (original) +++ trunk/packager/src/modules/PackageSlideShow.ycp Tue Nov 2 15:49:08 2010 @@ -71,7 +71,6 @@ integer current_provide_size = 0; integer current_install_size = 0; - string current_pkg_name = ""; boolean updating = false; void ResetPackageSummary() @@ -86,7 +85,6 @@ // temporary values current_provide_size = 0; current_install_size = 0; - current_pkg_name = ""; updating = false; } @@ -1098,7 +1096,7 @@ if (Mode::normal()) { - updated_packages_list = add(updated_packages_list, current_pkg_name); + updated_packages_list = add(updated_packages_list, pkg_name); } } else @@ -1107,7 +1105,7 @@ if (Mode::normal()) { - installed_packages_list = add(installed_packages_list, current_pkg_name); + installed_packages_list = add(installed_packages_list, pkg_name); } } @@ -1120,7 +1118,7 @@ if (Mode::normal()) { - removed_packages_list = add(removed_packages_list, current_pkg_name); + removed_packages_list = add(removed_packages_list, pkg_name); } } } @@ -1136,6 +1134,7 @@ * @param deleting Flag: deleting (true) or installing (false) package? **/ global void SlideDisplayStart( string pkg_name, + string pkg_location, string pkg_summary, integer pkg_size, boolean deleting ) @@ -1143,10 +1142,8 @@ if ( ! SanityCheck( false ) ) return; // remove path - pkg_name = StripPath(pkg_name); - - // remove release and .rpm suffix - // pkg_name = StripReleaseNo( pkg_name ); // bug #154872 + string pkg_filename = StripPath(pkg_location); + y2internal("pkg_name: %1", pkg_name); if ( deleting ) { @@ -1175,15 +1172,14 @@ // Heading for the progress bar for the current package // while it is deleted. "%1" is the package name. msg = sformat( _("Deleting %1"), pkg_name ); - current_pkg_name = pkg_name; } else { - updating = Pkg::PkgInstalled(current_pkg_name); + updating = Pkg::PkgInstalled(pkg_name); // package installation - summary text // %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB) - msg = sformat( _("Installing %1 (installed size %2)"), pkg_name, String::FormatSize( pkg_size ) ); + msg = sformat( _("Installing %1 (installed size %2)"), pkg_filename, String::FormatSize( pkg_size ) ); current_install_size = pkg_size; } @@ -1270,7 +1266,6 @@ global void SlideProvideStart (string pkg_name, integer sz, boolean remote) { current_provide_size = remote ? sz : 0; - current_pkg_name = pkg_name; if (remote) { Modified: trunk/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShowCa… ============================================================================== --- trunk/packager/src/modules/SlideShowCallbacks.ycp (original) +++ trunk/packager/src/modules/SlideShowCallbacks.ycp Tue Nov 2 15:49:08 2010 @@ -284,9 +284,9 @@ * Note: The packager doesn't call this directly - the corresponding wrapper callbacks do * and pass the "deleting" flag as appropriate. **/ - global void DisplayStartInstall(string pkg_name, string pkg_description, integer pkg_size, boolean deleting ) + global void DisplayStartInstall(string pkg_name, string pkg_location, string pkg_description, integer pkg_size, boolean deleting ) { - PackageSlideShow::SlideDisplayStart( pkg_name, pkg_description, pkg_size, deleting ); + PackageSlideShow::SlideDisplayStart( pkg_name, pkg_location, pkg_description, pkg_size, deleting ); HandleInput(); // warn user about exhausted diskspace during installation (not if deleting packages) @@ -368,13 +368,13 @@ /** * at start of package install */ - global void StartPackage( string name, string summary, integer install_size, boolean is_delete ) + global void StartPackage( string name, string location, string summary, integer install_size, boolean is_delete ) { PackageCallbacks::_package_name = name; PackageCallbacks::_package_size = install_size; PackageCallbacks::_deleting_package = is_delete; - DisplayStartInstall( name, + DisplayStartInstall( name, location, summary, install_size, is_delete); Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?… ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Tue Nov 2 15:49:08 2010 @@ -12,14 +12,14 @@ # Installation summary in PackagesUI:: BuildRequires: yast2 >= 2.18.1 -# "keeppackages" repo property -BuildRequires: yast2-pkg-bindings >= 2.17.27 +# changed StartPackage callback signature +BuildRequires: yast2-pkg-bindings >= 2.20.3 # Newly added RPM Requires: yast2-country-data >= 2.16.3 -# "keeppackages" repo property -Requires: yast2-pkg-bindings >= 2.17.27 +# changed StartPackage callback signature +Requires: yast2-pkg-bindings >= 2.20.3 # Installation summary in PackagesUI:: Requires: yast2 >= 2.18.1 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62716 - /tags/stable-2_20_3/pkg-bindings/
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:42:01 2010 New Revision: 62716 URL: http://svn.opensuse.org/viewcvs/yast?rev=62716&view=rev Log: Created tag stable-2_20_3 for pkg-bindings Added: tags/stable-2_20_3/pkg-bindings/ - copied from r62715, trunk/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62715 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Callbacks.cc src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:41:55 2010 New Revision: 62715 URL: http://svn.opensuse.org/viewcvs/yast?rev=62715&view=rev Log: - updated StartPackage callback - added the package name to the arguments (file location is not enough, it's too dificult to get just the name from it in YCP) - 2.20.3 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Callbacks.cc trunk/pkg-bindings/src/PkgFunctions.h Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=62715&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Tue Nov 2 15:41:55 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue Nov 2 15:41:55 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Nov 2 14:30:38 UTC 2010 - lslezak(a)suse.cz + +- updated StartPackage callback - added the package name to the + arguments (file location is not enough, it's too dificult to get + just the name from it in YCP) +- 2.20.3 + +------------------------------------------------------------------- Mon Oct 25 07:29:56 UTC 2010 - lslezak(a)suse.cz - ignore just the failed repository during autorefresh, load the Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Tue Nov 2 15:41:55 2010 @@ -244,6 +244,7 @@ CB callback( ycpcb( YCPCallbacks::CB_StartPackage ) ); if (callback._set) { + callback.addStr(res->name()); callback.addStr(res->location().filename()); callback.addStr(res->summary()); callback.addInt(res->installSize()); @@ -352,6 +353,7 @@ if (callback._set) { callback.addStr(resolvable->name()); callback.addStr(std::string()); + callback.addStr(std::string()); callback.addInt(-1); callback.addBool(true); // is_delete = true callback.evaluate(); Modified: trunk/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgFunctions.h?… ============================================================================== --- trunk/pkg-bindings/src/PkgFunctions.h (original) +++ trunk/pkg-bindings/src/PkgFunctions.h Tue Nov 2 15:41:55 2010 @@ -267,7 +267,7 @@ // FIXME: create ErrorProvide /* TYPEINFO: void(string(integer,string,string)) */ YCPValue CallbackDoneProvide (const YCPValue& /*nil*/ args); - /* TYPEINFO: void(void(string,string,integer,boolean)) */ + /* TYPEINFO: void(void(string,string,string,integer,boolean)) */ YCPValue CallbackStartPackage (const YCPValue& /*nil*/ args); /* TYPEINFO: void(boolean(integer)) */ YCPValue CallbackProgressPackage (const YCPValue& /*nil*/ args); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62714 - in /trunk/packager: agents/Makefile.am agents/etc_zypp_conf.scr package/yast2-packager.changes src/modules/PackageSlideShow.ycp
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 14:03:08 2010 New Revision: 62714 URL: http://svn.opensuse.org/viewcvs/yast?rev=62714&view=rev Log: - correctly display download progress in DownloadInAdvance libzypp mode (bnc#616708) Added: trunk/packager/agents/etc_zypp_conf.scr Modified: trunk/packager/agents/Makefile.am trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageSlideShow.ycp Modified: trunk/packager/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/agents/Makefile.am?rev=… ============================================================================== --- trunk/packager/agents/Makefile.am (original) +++ trunk/packager/agents/Makefile.am Tue Nov 2 14:03:08 2010 @@ -6,6 +6,7 @@ ag_zypp_repos scrconf_DATA = \ + etc_zypp_conf.scr \ zypp_repos.scr EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Added: trunk/packager/agents/etc_zypp_conf.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/agents/etc_zypp_conf.sc… ============================================================================== --- trunk/packager/agents/etc_zypp_conf.scr (added) +++ trunk/packager/agents/etc_zypp_conf.scr Tue Nov 2 14:03:08 2010 @@ -0,0 +1,65 @@ +/** + * File: + * etc_zypp_conf.scr + * Summary: + * SCR Agent for reading/writing /etc/zypp/zypp.conf file + * using the ini-agent + * Access: + * read/write + * Authors: + * Ladislav Slezak <lslezak(a)suse.cz> + * Example: + * + * Read list of available files + * SCR::Dir(.etc.zypp_conf) + * + * Read list of sections in a file + * SCR::Dir(.etc.policykit.section."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege") + * (["Privilege"]) + * + * Read list of options in a section + * SCR::Dir(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege") + * (["RequiredPrivileges", "SufficientPrivileges", "Allow", "Deny", "CanObtain", "CanGrant", "ObtainRequireRoot"]) + * + * Read an option + * SCR::Read(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege"."RequiredPrivileges") + * ("desktop-console") + * + * + * Write an option + * SCR::Write(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege"."RequiredPrivileges", "") + * (true) + * + * + * Flush the changes + * SCR::Write(.etc.zypp_conf, nil) + * + * + * Fore more information see the INI-agent documentation + * + * $Id$ + */ + +.etc.zypp_conf + +`ag_ini( + `IniAgent( "/etc/zypp/zypp.conf" , $[ + "options" : [ "no_nested_sections", "line_can_continue", "comments_last" ], + "comments": [ + "^[ \t]*$", // empty line + "^[ \t]*#.*$", // comment char + ], + "sections" : [ + $[ + "begin" : [ "^[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "[%s]" ], + ] + ], + "params" : [ + $[ + "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , "%s=%s"], + ] + ] + ] + ) +) + Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Nov 2 14:03:08 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 2 13:00:15 UTC 2010 - lslezak(a)suse.cz + +- correctly display download progress in DownloadInAdvance + libzypp mode (bnc#616708) + +------------------------------------------------------------------- Mon Nov 1 16:30:27 UTC 2010 - lslezak(a)suse.cz - sw_single: clear the startup progress dialog so it's not Modified: trunk/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageSlid… ============================================================================== --- trunk/packager/src/modules/PackageSlideShow.ycp (original) +++ trunk/packager/src/modules/PackageSlideShow.ycp Tue Nov 2 14:03:08 2010 @@ -16,6 +16,7 @@ import "SlideShow"; import "String"; import "Mode"; + import "URL"; global list<list<integer> > total_sizes_per_cd_per_src = []; // total sizes per inst-src: [ [42, 43, 44], [12, 13, 14] ] global list<list<integer> > remaining_sizes_per_cd_per_src = []; // remaining sizes @@ -28,6 +29,9 @@ global string media_type = _("Medium %1"); global integer total_size_installed = 0; global integer total_size_to_install = 0; + global integer total_count_to_download = 0; + global integer total_count_downloaded = 0; + global integer downloading_pct = 0; global integer min_time_per_cd = 10; // const - minimum time displayed per CD if there is something to install global integer max_time_per_cd = 7200; // const - seconds to cut off predicted time (it's bogus anyway) global integer size_column = 1; // const - column number for remaining size per CD @@ -47,6 +51,8 @@ string provide_name = ""; // currently downlaoded package name string provide_size = ""; // currently downlaoded package size + boolean download_in_advance_mode = false; + // package summary // package counters @@ -405,6 +411,50 @@ y2milestone( "SubtractPackageSize( %1 ) -> %2", pkg_size, remaining_sizes_per_cd_per_src); } + integer packages_to_download(list<list<integer> >src_mapping) + { + y2milestone("Packages to download input: %1", src_mapping); + + integer ret = 0; + + integer i = 0; + foreach(list<integer> media_mapping, src_mapping, + { + if (size(media_mapping) > 0) + { + // check if the repository is remote + string repo_url = Pkg::SourceGeneralData(i)["url"]:""; + string repo_schema = tolower(URL::Parse(repo_url)["scheme"]:""); + + if (contains(["http", "https", "ftp", "sftp"], repo_schema)) + { + integer total = 0; + foreach(integer count, media_mapping, + { + total = total + count; + } + ); + + y2milestone("Downloading %1 packages from remote repository %2", total, i); + ret = ret + total; + } + } + + i = i + 1; + } + ); + + y2milestone("Total number of packages to download: %1", ret); + + return ret; + } + + integer packages_to_install(list<list<integer> >src_mapping) + { + integer ret = ListSum(flatten(src_mapping)); + y2milestone("Total number of packages to install: %1", ret); + return ret; + } /** * Initialize internal pacakge data, such as remaining package sizes and @@ -454,6 +504,11 @@ remaining_sizes_per_cd_per_src = (list<list <integer> >) eval (total_sizes_per_cd_per_src); remaining_pkg_count_per_cd_per_src = (list<list <integer> >) eval (total_pkg_count_per_cd_per_src); total_cd_count = size( flatten( total_sizes_per_cd_per_src ) ); + total_count_to_download = packages_to_download(total_pkg_count_per_cd_per_src); + total_count_downloaded = 0; + integer total_count_to_install = packages_to_install(total_pkg_count_per_cd_per_src); + downloading_pct = 100 * total_count_to_download / (total_count_to_install + total_count_to_download); + download_in_advance_mode= (string)SCR::Read(.etc.zypp_conf.value.main."commit.downloadMode") == "DownloadInAdvance"; init_pkg_data_complete = true; // reset the history log @@ -783,6 +838,27 @@ } } + // update the overall progress value (download + installation) + void UpdateTotalProgressValue() + { + integer total_progress = 0; + + if (total_count_to_download == 0) + { + // no package to download, just use the install size + total_progress = (TotalInstalledSize() * 100 / total_size_to_install); + } + else + { + // compute the total progress (use both download and installation size) + total_progress = (total_count_downloaded * downloading_pct / total_count_to_download) + + (TotalInstalledSize() * (100 - downloading_pct) / total_size_to_install); + } + + y2internal("Total package installation progress: %1%%", total_progress); + SlideShow::StageProgress( total_progress, nil ); + } + /** * Update progress widgets **/ @@ -796,7 +872,8 @@ total_size_to_install_kB = 1; } - SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / total_size_to_install_kB, nil /*, SlideShow::GetProgressLabel()*/ ); + // update the overall progress value (download + installation) + UpdateTotalProgressValue(); UpdateCurrentCdProgress(silent_check); @@ -943,6 +1020,21 @@ if (error == 0) { total_downloaded = total_downloaded + current_provide_size; + + total_count_downloaded = total_count_downloaded + 1; + y2milestone("Downloaded %1/%2 packages (%3%%)", total_count_downloaded, total_count_to_download, total_count_downloaded * 100 / total_count_to_download); + + // move the progress also for downloaded files + UpdateTotalProgressValue(); + + if (download_in_advance_mode) + { + // display download progress in DownloadInAdvance mode + // translations: progress message (part1) + SlideShow::SetGlobalProgressLabel( _("Downloading Packages...") + + // progress message (part2) + sformat(_(" (Downloaded %1 of %2 packages)"), total_count_downloaded, total_count_to_download)); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62713 - /tags/stable-2_21_80/gtk/
by rpmcruz＠svn2.opensuse.org 01 Nov '10

01 Nov '10

Author: rpmcruz Date: Mon Nov 1 17:50:47 2010 New Revision: 62713 URL: http://svn.opensuse.org/viewcvs/yast?rev=62713&view=rev Log: Created tag stable-2_21_80 for gtk Added: tags/stable-2_21_80/gtk/ - copied from r62712, trunk/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62712 - /tags/stable-2_21_80/
by rpmcruz＠svn2.opensuse.org 01 Nov '10

01 Nov '10

Author: rpmcruz Date: Mon Nov 1 17:50:40 2010 New Revision: 62712 URL: http://svn.opensuse.org/viewcvs/yast?rev=62712&view=rev Log: Created tag stable-2_21_80 Added: tags/stable-2_21_80/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62711 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 01 Nov '10

01 Nov '10

Author: rpmcruz Date: Mon Nov 1 17:50:37 2010 New Revision: 62711 URL: http://svn.opensuse.org/viewcvs/yast?rev=62711&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62711&r1=62710&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Mon Nov 1 17:50:37 2010 @@ -1 +1 @@ -2.21.79 +2.21.80 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62711&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Mon Nov 1 17:50:37 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "79") +SET(VERSION_PATCH "80") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Mon Nov 1 17:50:37 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 01 16:49:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.80 +- fix: show the software manager header bar. + +------------------------------------------------------------------- Sun Oct 31 18:43:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.79 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62710 - in /trunk/gtk: ChangeLog src/YGUtils.cc src/YGUtils.h src/pkg/YGPackageSelector.cc src/pkg/ygtkpkgsearchentry.cc src/pkg/ygtkpkgstatusbar.cc src/ygtkwizard.c src/ygtkwizard.h
by rpmcruz＠svn2.opensuse.org 01 Nov '10

01 Nov '10

Author: rpmcruz Date: Mon Nov 1 17:49:26 2010 New Revision: 62710 URL: http://svn.opensuse.org/viewcvs/yast?rev=62710&view=rev Log: * src/pkg/YGPackageSelector.cc: show header bar. * src/pkg/ygtkpkgsearchentry.cc: shrink combo size. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGUtils.h trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpkgsearchentry.cc trunk/gtk/src/pkg/ygtkpkgstatusbar.cc trunk/gtk/src/ygtkwizard.c trunk/gtk/src/ygtkwizard.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62710&r1=62709… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Nov 1 17:49:26 2010 @@ -1,3 +1,9 @@ +2010-11-01 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/YGPackageSelector.cc: show header bar. + + * src/pkg/ygtkpkgsearchentry.cc: shrink combo size. + 2010-10-31 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc & src/pkg/ygtkpkgmenubar.cc: Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=62710&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Mon Nov 1 17:49:26 2010 @@ -721,6 +721,24 @@ return icon; } +void YGUtils::shrinkWidget (GtkWidget *widget) +{ + static bool first_time = true; + if (first_time) { + first_time = false; + gtk_rc_parse_string ( + "style \"small-widget-style\"\n" + "{\n" + " GtkWidget::focus-padding = 0\n" + " GtkWidget::focus-line-width = 0\n" + " xthickness = 0\n" + " ythickness = 0\n" + "}\n" + "widget \"*.small-widget\" style \"small-widget-style\""); + } + gtk_widget_set_name (widget, "small-widget"); +} + /* * construct a help string by dropping the title, and mentioning * the first sentence for a dialog sub-title Modified: trunk/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.h?rev=62710&r1=6… ============================================================================== --- trunk/gtk/src/YGUtils.h (original) +++ trunk/gtk/src/YGUtils.h Mon Nov 1 17:49:26 2010 @@ -65,6 +65,9 @@ /* For empty model rows, render a separator (can be used for GtkTreeView and GtkComboBox */ gboolean empty_row_is_separator_cb ( GtkTreeModel *model, GtkTreeIter *iter, gpointer text_col); + + /* Shrink widget inner-border (thickness) */ + void shrinkWidget (GtkWidget *widget); }; extern "C" { Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Mon Nov 1 17:49:26 2010 @@ -689,7 +689,7 @@ impl = new Impl(); // can take a little ygtk_wizard_set_child (wizard, impl->getWidget()); impl->m_menu = new YGtkPkgMenuBar(); - ygtk_wizard_set_custom_menu (wizard, impl->m_menu->getWidget(), TRUE); + ygtk_wizard_set_custom_menubar (wizard, impl->m_menu->getWidget(), FALSE); //** TEMP: work-around global-menubar-applet: see bug 595560 gtk_widget_show_all (impl->m_menu->getWidget()); Modified: trunk/gtk/src/pkg/ygtkpkgsearchentry.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgsearchentry.c… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgsearchentry.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgsearchentry.cc Mon Nov 1 17:49:26 2010 @@ -106,6 +106,7 @@ gtk_combo_box_append_text (GTK_COMBO_BOX (impl->combo), "RPM Requires"); } gtk_combo_box_set_active (GTK_COMBO_BOX (impl->combo), 0); + YGUtils::shrinkWidget (impl->combo); g_signal_connect (G_OBJECT (impl->combo), "changed", G_CALLBACK (combo_changed_cb), this); gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (impl->combo), Modified: trunk/gtk/src/pkg/ygtkpkgstatusbar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgstatusbar.cc?… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgstatusbar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgstatusbar.cc Mon Nov 1 17:49:26 2010 @@ -19,20 +19,9 @@ #include "yzyppwrapper.h" #include <gtk/gtk.h> -static void small_size_request_cb (GtkWidget *widget, GtkRequisition *req) +static void enlarge_width_size_request_cb (GtkWidget *widget, GtkRequisition *req) { req->width += 4; } -static void set_small_widget (GtkWidget *widget) -{ - GtkRcStyle *rcstyle = gtk_rc_style_new(); - rcstyle->xthickness = rcstyle->ythickness = 0; - gtk_widget_modify_style (widget, rcstyle); - g_object_unref (rcstyle); - - g_signal_connect (G_OBJECT (widget), "size-request", - G_CALLBACK (small_size_request_cb), NULL); -} - struct LastChange { GtkWidget *hbox, *icon, *text, *undo_button; @@ -46,7 +35,9 @@ text = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (text), 0, .5); undo_button = gtk_button_new_from_stock (GTK_STOCK_UNDO); - set_small_widget (undo_button); + YGUtils::shrinkWidget (undo_button); + g_signal_connect (G_OBJECT (undo_button), "size-request", + G_CALLBACK (enlarge_width_size_request_cb), NULL); g_signal_connect (G_OBJECT (undo_button), "clicked", G_CALLBACK (undo_clicked_cb), this); gchar *str = g_strdup_printf ("(<a href=\"more\">%s</a>)", _("view all changes")); @@ -224,7 +215,7 @@ combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store)); g_object_unref (G_OBJECT (store)); - set_small_widget (combo); + YGUtils::shrinkWidget (combo); gtk_widget_set_name (combo, "small-widget"); gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (combo), FALSE); GtkCellRenderer *renderer = gtk_cell_renderer_text_new(); Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=62710&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Mon Nov 1 17:49:26 2010 @@ -956,7 +956,7 @@ { if (!wizard->menu) { wizard->menu = gtk_menu_bar_new(); - ygtk_wizard_set_custom_menu (wizard, wizard->menu, TRUE); + ygtk_wizard_set_custom_menubar (wizard, wizard->menu, TRUE); gtk_widget_show (wizard->menu); } @@ -1037,7 +1037,7 @@ } } -void ygtk_wizard_set_custom_menu (YGtkWizard *wizard, GtkWidget *menu_bar, gboolean hide_header) +void ygtk_wizard_set_custom_menubar (YGtkWizard *wizard, GtkWidget *menu_bar, gboolean hide_header) { gtk_container_add (GTK_CONTAINER (wizard->m_menu_box), menu_bar); gtk_widget_show (wizard->m_menu_box); Modified: trunk/gtk/src/ygtkwizard.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.h?rev=62710&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.h (original) +++ trunk/gtk/src/ygtkwizard.h Mon Nov 1 17:49:26 2010 @@ -161,7 +161,7 @@ const char *text, const char *id); gboolean ygtk_wizard_add_menu_separator (YGtkWizard *wizard, const char *parent_id); void ygtk_wizard_clear_menu (YGtkWizard *wizard); -void ygtk_wizard_set_custom_menu (YGtkWizard *wizard, GtkWidget *menu_bar, gboolean hide_header); +void ygtk_wizard_set_custom_menubar (YGtkWizard *wizard, GtkWidget *menu_bar, gboolean hide_header); void ygtk_wizard_set_status_bar (YGtkWizard *wizard, GtkWidget *status_bar); void ygtk_wizard_add_step_header (YGtkWizard *wizard, const char *text); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62709 - in /trunk/packager: package/yast2-packager.changes src/clients/sw_single.ycp
by lslezak＠svn2.opensuse.org 01 Nov '10

01 Nov '10

Author: lslezak Date: Mon Nov 1 17:34:10 2010 New Revision: 62709 URL: http://svn.opensuse.org/viewcvs/yast?rev=62709&view=rev Log: - sw_single: clear the startup progress dialog so it's not displayed in slow systems at the end (bnc#637201) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/sw_single.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Nov 1 17:34:10 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 1 16:30:27 UTC 2010 - lslezak(a)suse.cz + +- sw_single: clear the startup progress dialog so it's not + displayed in slow systems at the end (bnc#637201) + +------------------------------------------------------------------- Wed Oct 27 14:36:59 CEST 2010 - mzugec(a)suse.cz - improved UI layout (bnc#619653) Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.y… ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Mon Nov 1 17:34:10 2010 @@ -456,7 +456,8 @@ // check the arguments and try the mount/search for local description symbol result = CheckWhichPackages (arg_list); - Progress::Finish(); + // clear the progress dialog so it's not displayed by accident at the end (bnc#637201) + Wizard::SetContents ("", `Empty(), "", false, false); Pkg::SetTextLocale (UI::GetLanguage (true)); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62708 - /trunk/gtk/src/pkg/ygtkpkgstatusbar.cc
by rpmcruz＠svn2.opensuse.org 01 Nov '10

01 Nov '10

Author: rpmcruz Date: Mon Nov 1 17:26:56 2010 New Revision: 62708 URL: http://svn.opensuse.org/viewcvs/yast?rev=62708&view=rev Log: Shortened style code. Modified: trunk/gtk/src/pkg/ygtkpkgstatusbar.cc Modified: trunk/gtk/src/pkg/ygtkpkgstatusbar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgstatusbar.cc?… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgstatusbar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgstatusbar.cc Mon Nov 1 17:26:56 2010 @@ -24,21 +24,11 @@ static void set_small_widget (GtkWidget *widget) { - static bool first_time = true; - if (first_time) { - first_time = false; - gtk_rc_parse_string ( - "style \"small-widget-style\"\n" - "{\n" - " GtkWidget::focus-padding = 0\n" - " GtkWidget::focus-line-width = 0\n" - " xthickness = 0\n" - " ythickness = 0\n" - "}\n" - "widget \"*.small-widget\" style \"small-widget-style\""); - } + GtkRcStyle *rcstyle = gtk_rc_style_new(); + rcstyle->xthickness = rcstyle->ythickness = 0; + gtk_widget_modify_style (widget, rcstyle); + g_object_unref (rcstyle); - gtk_widget_set_name (widget, "small-widget"); g_signal_connect (G_OBJECT (widget), "size-request", G_CALLBACK (small_size_request_cb), NULL); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0