October 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62607 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgList.cc
by tgoettlicher＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: tgoettlicher Date: Tue Oct 12 15:57:37 2010 New Revision: 62607 URL: http://svn.opensuse.org/viewcvs/yast?rev=62607&view=rev Log: fixed Bug 422226 - [Qt4-Pkg] Switching patterns should scroll the package list back to the top Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgList.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=62607&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Tue Oct 12 15:57:37 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "0") +SET(VERSION_PATCH "1") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Tue Oct 12 15:57:37 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 12 15:57:01 CEST 2010 - tgoettlicher(a)suse.de + +- fixed bnc #422226: Switching patterns should scroll the + package list back to the top +- 2.20.1 + +------------------------------------------------------------------- Tue Jul 13 13:53:01 UTC 2010 - dmacvicar(a)suse.de - bnc#621649 patterns with no categories were supposed to be Modified: trunk/qt-pkg/src/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=6260… ============================================================================== --- trunk/qt-pkg/src/YQPkgList.cc (original) +++ trunk/qt-pkg/src/YQPkgList.cc Tue Oct 12 15:57:37 2010 @@ -154,6 +154,7 @@ ZyppPkg zyppPkg, bool dimmed ) { + scrollToTop(); scheduleDelayedItemsLayout(); if ( ! selectable ) -- 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] r62606 - /tags/stable-2_20_1/country/
by jsuchome＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: jsuchome Date: Tue Oct 12 15:29:48 2010 New Revision: 62606 URL: http://svn.opensuse.org/viewcvs/yast?rev=62606&view=rev Log: Created tag stable-2_20_1 for country Added: tags/stable-2_20_1/country/ - copied from r62605, 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] r62605 - in /trunk/country: VERSION language/src/select_language.ycp package/yast2-country.changes
by jsuchome＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: jsuchome Date: Tue Oct 12 15:28:43 2010 New Revision: 62605 URL: http://svn.opensuse.org/viewcvs/yast?rev=62605&view=rev Log: - show icons in language lists (first IconPath, than Items!) - 2.20.1 Modified: trunk/country/VERSION 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=62605&r1=626… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Tue Oct 12 15:28:43 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 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 Tue Oct 12 15:28:43 2010 @@ -404,13 +404,13 @@ if (more_languages) { - UI::ChangeWidget( `language, `Items, primary_items ); - UI::ChangeWidget( `languages, `Items, secondary_items ); if (!Stage::initial () && !Stage::firstboot ()) { UI::ChangeWidget( `language, `IconPath, "/usr/share/locale/l10n/" ); UI::ChangeWidget( `languages, `IconPath, "/usr/share/locale/l10n/"); } + UI::ChangeWidget( `language, `Items, primary_items ); + UI::ChangeWidget( `languages, `Items, secondary_items ); } // No .desktop files in inst-sys - use icon explicitly 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 Oct 12 15:28:43 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 12 15:27:39 CEST 2010 - jsuchome(a)suse.cz + +- show icons in language lists +- 2.20.1 + +------------------------------------------------------------------- Thu Aug 12 09:05:38 CEST 2010 - jsuchome(a)suse.cz - mkinitrd call is needed after time change with localtime -- 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] r62604 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: gs Date: Tue Oct 12 14:49:37 2010 New Revision: 62604 URL: http://svn.opensuse.org/viewcvs/yast?rev=62604&view=rev Log: add new line after pre is closed Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=62… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Tue Oct 12 14:49:37 2010 @@ -484,6 +484,7 @@ SkipPreTXT( wch ); PadPlainTXT( swch, wch - swch ); preTag = false; + PadNL(); // add new line after pre is closed } break; -- 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] r62603 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes yast2-qt.spec.in
by tgoettlicher＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: tgoettlicher Date: Tue Oct 12 14:20:02 2010 New Revision: 62603 URL: http://svn.opensuse.org/viewcvs/yast?rev=62603&view=rev Log: Fixed font dependency (bnc #629892) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/yast2-qt.spec.in Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=62603&r1=62… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Tue Oct 12 14:20:02 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") 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 Tue Oct 12 14:20:02 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 11 10:23:07 CEST 2010 - tgoettlicher(a)suse.de + +- Fixed font dependency (bnc #629892) +- V 2.19.3 + +------------------------------------------------------------------- Thu Jun 17 10:43:05 CEST 2010 - tgoettlicher(a)suse.de - Fixed left hand to right hand changing (bnc #612030) Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=62603&r1… ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Tue Oct 12 14:20:02 2010 @@ -31,6 +31,7 @@ Provides: y2qt Obsoletes: y2qt Recommends: yast2-qt-pkg +Recommends: xorg-x11-fonts %description One of several user interfaces available for YaST2, based on Qt and the -- 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] r62602 - in /branches/SuSE-Code-11-SP2-Branch/sound: data/ data/addons/ data/src/ package/
by lslezak＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: lslezak Date: Tue Oct 12 12:59:11 2010 New Revision: 62602 URL: http://svn.opensuse.org/viewcvs/yast?rev=62602&view=rev Log: - added Creative X-Fi to sound card DB (bnc#613746) Modified: branches/SuSE-Code-11-SP2-Branch/sound/data/addons/card_addons.ycp branches/SuSE-Code-11-SP2-Branch/sound/data/addons/id_addons.ycp branches/SuSE-Code-11-SP2-Branch/sound/data/addons/mod_addons.ycp branches/SuSE-Code-11-SP2-Branch/sound/data/sndcards.ycp branches/SuSE-Code-11-SP2-Branch/sound/data/src/module_index.ycp branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes Modified: branches/SuSE-Code-11-SP2-Branch/sound/data/addons/card_addons.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/data/addons/card_addons.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/data/addons/card_addons.ycp Tue Oct 12 12:59:11 2010 @@ -375,4 +375,5 @@ ["snd-cs5535audio", "CS5535, National Semiconductor"], ["snd-cs5535audio", "CS5536, AMD"], ["snd_ps3", "PS3 Soundcard, Sony"], + ["snd-ctxfi", "X-Fi, Creative Labs"], ] Modified: branches/SuSE-Code-11-SP2-Branch/sound/data/addons/id_addons.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/data/addons/id_addons.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/data/addons/id_addons.ycp Tue Oct 12 12:59:11 2010 @@ -5,5 +5,8 @@ ["snd-powermac", "0x30401", "0x30012"], ["snd-powermac", "0x30401", "0x30013"], // PS3 - ["snd_ps3", "0x0104D", "0x31004"] + ["snd_ps3", "0x0104D", "0x31004"], + // X-Fi + ["snd-ctxfi", "0x01102", "0x0000b"], + ["snd-ctxfi", "0x01102", "0x00005"], ] Modified: branches/SuSE-Code-11-SP2-Branch/sound/data/addons/mod_addons.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/data/addons/mod_addons.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/data/addons/mod_addons.ycp Tue Oct 12 12:59:11 2010 @@ -20,4 +20,8 @@ $[ "description" : "PS3 Soundcard" ], + "snd-ctxfi": + $[ + "description" : "Creative Labs X-Fi" + ], ] Modified: branches/SuSE-Code-11-SP2-Branch/sound/data/sndcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/data/sndcards.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/data/sndcards.ycp Tue Oct 12 12:59:11 2010 @@ -531,6 +531,9 @@ "CS5535, National Semiconductor", "CS5536, AMD" ], + 83 : [ + "X-Fi, Creative Labs" + ], 100 : [ "PowerPC, Apple" ], @@ -786,9 +789,11 @@ 4354 : $[ 2 : 22, 4 : 22, + 5 : 83, 6 : 76, 7 : 77, 8 : 22, + 11: 83, 35128 : 24 ], 4358 : $[ @@ -1044,6 +1049,7 @@ 80 : "snd-ad1889", 81 : "snd-cs5535audio", 82 : "snd-oxygen", + 83 : "snd-ctxfi", 100 : "snd-powermac", 101 : "snd-aoa", 102 : "snd_ps3" @@ -3921,7 +3927,8 @@ "SB 1.0/SB 2.0/SB Pro", "SB AWE 32", "SB AWE 64 Gold", - "SB AWE 64" + "SB AWE 64", + "X-Fi" ], "Crystal" : [ "3D" Modified: branches/SuSE-Code-11-SP2-Branch/sound/data/src/module_index.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/data/src/module_index.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/data/src/module_index.ycp Tue Oct 12 12:59:11 2010 @@ -100,6 +100,7 @@ 80 : "snd-ad1889", 81 : "snd-cs5535audio", 82 : "snd-oxygen", + 83 : "snd-ctxfi", 100 : "snd-powermac", 101 : "snd-aoa", Modified: branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes Tue Oct 12 12:59:11 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Oct 12 10:53:46 UTC 2010 - lslezak(a)suse.cz + +- added Creative X-Fi to sound card DB (bnc#613746) + +------------------------------------------------------------------- Wed Apr 1 14:19:56 CEST 2009 - lslezak(a)suse.cz - make channel names unique - add channel index to channel name -- 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] r62601 - /branches/SuSE-Code-11-SP2-Branch/sound/
by lslezak＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: lslezak Date: Tue Oct 12 12:47:36 2010 New Revision: 62601 URL: http://svn.opensuse.org/viewcvs/yast?rev=62601&view=rev Log: copy yast2-sound to SP2 branch Added: branches/SuSE-Code-11-SP2-Branch/sound/ (props changed) - copied from r62600, branches/SuSE-Code-11-SP1-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] r62600 - /tags/stable-2_20_2/packager/
by lslezak＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: lslezak Date: Tue Oct 12 11:51:43 2010 New Revision: 62600 URL: http://svn.opensuse.org/viewcvs/yast?rev=62600&view=rev Log: Created tag stable-2_20_2 for packager Added: tags/stable-2_20_2/packager/ - copied from r62599, 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] r62599 - /trunk/packager/src/modules/SourceDialogs.ycp
by lslezak＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: lslezak Date: Tue Oct 12 11:51:12 2010 New Revision: 62599 URL: http://svn.opensuse.org/viewcvs/yast?rev=62599&view=rev Log: fixed debug message Modified: trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Tue Oct 12 11:51:12 2010 @@ -1346,7 +1346,7 @@ if (parsed == parsed_old) { y2milestone("No change, NOT updating the complete URL"); - y2debug("Unchanged URL: %1"); + y2debug("Unchanged URL: %1", parsed); } 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] r62598 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/SourceDialogs.ycp
by lslezak＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: lslezak Date: Tue Oct 12 11:49:15 2010 New Revision: 62598 URL: http://svn.opensuse.org/viewcvs/yast?rev=62598&view=rev Log: - repo mgr: don't change URL when nothing has changed in the URL dialog (bnc#529944) - 2.20.2 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62598&r1=62… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Oct 12 11:49:15 2010 @@ -1 +1 @@ -2.20.1 +2.20.2 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 Oct 12 11:49:15 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 12 09:39:59 UTC 2010 - lslezak(a)suse.cz + +- repo mgr: don't change URL when nothing has changed in the URL + dialog (bnc#529944) +- 2.20.2 + +------------------------------------------------------------------- Tue Oct 5 10:45:54 UTC 2010 - lslezak(a)suse.cz - install yast2-online-update-configuration package if needed Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Tue Oct 12 11:49:15 2010 @@ -1258,7 +1258,18 @@ void ServerStoreParts() { symbol type = (symbol) UI::QueryWidget( `id( `rb_type), `CurrentButton ); - map parsed = $[]; + + // initialize keys to empty values so the new and old values can be simply compared + map parsed = $[ + "fragment":"", + "host":"", + "pass":"", + "path":"", + "port":"", + "query":"", + "scheme":"", + "user":"" + ]; if ( type == `ftp ) parsed["scheme"] = "ftp"; else if ( type == `http ) @@ -1330,16 +1341,29 @@ parsed["port"] = (string)UI::QueryWidget(`id(`port), `Value); } - // do not log the entered password - y2milestone("Entered URL: %1", URL::HidePasswordToken(parsed)); - _url = URL::Build (parsed); - y2milestone("URL::Build: %1", URL::HidePassword(_url)); - - if (UI::WidgetExists (`id (`ch_iso))) - { - boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value); - if (iso) - _url = PosprocessISOURL (_url); + // keep the URL if user haven't changed anything (don't change escaped chars bnc#529944) + map parsed_old = URL::Parse(_url); + if (parsed == parsed_old) + { + y2milestone("No change, NOT updating the complete URL"); + y2debug("Unchanged URL: %1"); + } + else + { + y2milestone("A change detected, updating complete URL"); + y2debug("Updating the URL: %1 -> %2", parsed_old, parsed); + + // do not log the entered password + y2milestone("Entered URL: %1", URL::HidePasswordToken(parsed)); + _url = URL::Build (parsed); + y2milestone("URL::Build: %1", URL::HidePassword(_url)); + + if (UI::WidgetExists (`id (`ch_iso))) + { + boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value); + if (iso) + _url = PosprocessISOURL (_url); + } } } -- 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] r62597 - in /branches/tmp/jsrain/unattended-migration/yast2/library: system/src/ModuleLoading.ycp wizard/src/Confirm.ycp
by jsrain＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: jsrain Date: Tue Oct 12 11:23:09 2010 New Revision: 62597 URL: http://svn.opensuse.org/viewcvs/yast?rev=62597&view=rev Log: avoid interruption of automated upgrade process (bnc#644637) Modified: branches/tmp/jsrain/unattended-migration/yast2/library/system/src/ModuleLoading.ycp branches/tmp/jsrain/unattended-migration/yast2/library/wizard/src/Confirm.ycp Modified: branches/tmp/jsrain/unattended-migration/yast2/library/system/src/ModuleLoading.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/yast2/library/system/src/ModuleLoading.ycp (original) +++ branches/tmp/jsrain/unattended-migration/yast2/library/system/src/ModuleLoading.ycp Tue Oct 12 11:23:09 2010 @@ -132,7 +132,7 @@ return `dont; } - if (ask_before_loading && !Mode::autoinst()) + if (ask_before_loading && (!Mode::autoinst()) && (!Mode::autoupgrade())) { UI::OpenDialog(`opt(`decorated, `centered), Modified: branches/tmp/jsrain/unattended-migration/yast2/library/wizard/src/Confirm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/yast2/library/wizard/src/Confirm.ycp (original) +++ branches/tmp/jsrain/unattended-migration/yast2/library/wizard/src/Confirm.ycp Tue Oct 12 11:23:09 2010 @@ -40,7 +40,7 @@ if(Linuxrc::manual () != true) return true; // L3: no interaction in AY, just re-probe (bnc#568653) - if(Mode::autoinst () == true) return true; + if(Mode::autoinst () == true || Mode::autoupgrade() == true) return true; if(Arch::s390()) 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] r62596 - /branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_system_analysis.ycp
by jsrain＠svn2.opensuse.org 12 Oct '10

12 Oct '10

Author: jsrain Date: Tue Oct 12 10:57:53 2010 New Revision: 62596 URL: http://svn.opensuse.org/viewcvs/yast?rev=62596&view=rev Log: syntax fix Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_system_analysis.ycp Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_system_analysis.ycp (original) +++ branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_system_analysis.ycp Tue Oct 12 10:57:53 2010 @@ -111,7 +111,7 @@ if (size (targetMap) == 0) { if (found_controllers) { - if( !(Mode::autoinst() || Mode::autoupgrade()) { + if( !(Mode::autoinst() || Mode::autoupgrade())) { // pop-up error report Report::Error(_("No hard disks were found for the installation. Please check your hardware! -- 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] r62595 - /trunk/dbus-server/package/yast2-dbus-server.changes
by mvidner＠svn2.opensuse.org 11 Oct '10

11 Oct '10

Author: mvidner Date: Mon Oct 11 14:03:52 2010 New Revision: 62595 URL: http://svn.opensuse.org/viewcvs/yast?rev=62595&view=rev Log: let's not bump the version yet Modified: trunk/dbus-server/package/yast2-dbus-server.changes Modified: trunk/dbus-server/package/yast2-dbus-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dbus-server/package/yast2-dbus-s… ============================================================================== --- trunk/dbus-server/package/yast2-dbus-server.changes (original) +++ trunk/dbus-server/package/yast2-dbus-server.changes Mon Oct 11 14:03:52 2010 @@ -2,7 +2,6 @@ Mon Oct 11 13:54:01 CEST 2010 - mvidner(a)suse.cz - Build fix: python-2.7 moved unittest to python-devel -- 2.20.1 ------------------------------------------------------------------- Thu Jul 15 11:05:35 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] r62594 - /trunk/dbus-server/yast2-dbus-server.spec.in
by mvidner＠svn2.opensuse.org 11 Oct '10

11 Oct '10

Author: mvidner Date: Mon Oct 11 14:02:22 2010 New Revision: 62594 URL: http://svn.opensuse.org/viewcvs/yast?rev=62594&view=rev Log: Build fix: python-2.7 moved unittest to python-devel ceterum censeo svn abandonanda est! Modified: trunk/dbus-server/yast2-dbus-server.spec.in Modified: trunk/dbus-server/yast2-dbus-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/dbus-server/yast2-dbus-server.sp… ============================================================================== --- trunk/dbus-server/yast2-dbus-server.spec.in (original) +++ trunk/dbus-server/yast2-dbus-server.spec.in Mon Oct 11 14:02:22 2010 @@ -20,7 +20,7 @@ # for SCR DBus service BuildRequires: dbus-1-devel dbus-1-x11 PolicyKit-devel libxcrypt-devel # its tests -BuildRequires: dbus-1-python +BuildRequires: dbus-1-python python-devel Summary: YaST2 - DBus 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] r62593 - /trunk/dbus-server/package/yast2-dbus-server.changes
by mvidner＠svn2.opensuse.org 11 Oct '10

11 Oct '10

Author: mvidner Date: Mon Oct 11 14:00:36 2010 New Revision: 62593 URL: http://svn.opensuse.org/viewcvs/yast?rev=62593&view=rev Log: Build fix: python-2.7 moved unittest to python-devel Modified: trunk/dbus-server/package/yast2-dbus-server.changes Modified: trunk/dbus-server/package/yast2-dbus-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dbus-server/package/yast2-dbus-s… ============================================================================== --- trunk/dbus-server/package/yast2-dbus-server.changes (original) +++ trunk/dbus-server/package/yast2-dbus-server.changes Mon Oct 11 14:00:36 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 11 13:54:01 CEST 2010 - mvidner(a)suse.cz + +- Build fix: python-2.7 moved unittest to python-devel +- 2.20.1 + +------------------------------------------------------------------- Thu Jul 15 11:05:35 UTC 2010 - lslezak(a)suse.cz - set PATH environment to the default if it's not set (bnc#617442) -- 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] r62592 - /branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_system_analysis.ycp
by jsrain＠svn2.opensuse.org 11 Oct '10

11 Oct '10

Author: jsrain Date: Mon Oct 11 11:22:26 2010 New Revision: 62592 URL: http://svn.opensuse.org/viewcvs/yast?rev=62592&view=rev Log: suppress error message on AutoUpgrade - disk detection (bnc#644960) Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_system_analysis.ycp Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_system_analysis.ycp (original) +++ branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_system_analysis.ycp Mon Oct 11 11:22:26 2010 @@ -111,7 +111,7 @@ if (size (targetMap) == 0) { if (found_controllers) { - if( !Mode::autoinst() ) { + if( !(Mode::autoinst() || Mode::autoupgrade()) { // pop-up error report Report::Error(_("No hard disks were found for the installation. Please check your hardware! -- 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] r62591 - in /trunk/control-center: VERSION.cmake package/yast2-control-center.changes yast2-control-center.spec.in
by tgoettlicher＠svn2.opensuse.org 11 Oct '10

11 Oct '10

Author: tgoettlicher Date: Mon Oct 11 11:19:19 2010 New Revision: 62591 URL: http://svn.opensuse.org/viewcvs/yast?rev=62591&view=rev Log: adapted license format in spec file Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/yast2-control-center.spec.in Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev… ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Mon Oct 11 11:19:19 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Mon Oct 11 11:19:19 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 11 11:17:55 CEST 2010 - tgoettlicher(a)suse.de + +- Adapted license format +- 2.19.3 + +------------------------------------------------------------------- Fri Oct 8 12:32:21 CEST 2010 - tgoettlicher(a)suse.de - fixed: bnc #644856: wrong systemsetting category Modified: trunk/control-center/yast2-control-center.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/yast2-control-cen… ============================================================================== --- trunk/control-center/yast2-control-center.spec.in (original) +++ trunk/control-center/yast2-control-center.spec.in Mon Oct 11 11:19:19 2010 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPLv2+ BuildRequires: libdrm-devel libjpeg-devel pkgconfig libqt4-devel update-desktop-files yast2-devtools BuildRequires: cmake -- 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] r62590 - /trunk/gtk/package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: rpmcruz Date: Fri Oct 8 22:45:28 2010 New Revision: 62590 URL: http://svn.opensuse.org/viewcvs/yast?rev=62590&view=rev Log: Milestone version. Modified: trunk/gtk/package/yast2-gtk.changes 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 Fri Oct 8 22:45:28 2010 @@ -3,6 +3,7 @@ - 2.21.77 - another string review. +- added mnemonics to menu-bar. ------------------------------------------------------------------- Thu Oct 07 13:22:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt -- 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] r62589 - /tags/stable-2_21_77/gtk/
by rpmcruz＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: rpmcruz Date: Fri Oct 8 22:37:26 2010 New Revision: 62589 URL: http://svn.opensuse.org/viewcvs/yast?rev=62589&view=rev Log: Created tag stable-2_21_77 for gtk Added: tags/stable-2_21_77/gtk/ - copied from r62588, 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] r62588 - /tags/stable-2_21_77/
by rpmcruz＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: rpmcruz Date: Fri Oct 8 22:37:17 2010 New Revision: 62588 URL: http://svn.opensuse.org/viewcvs/yast?rev=62588&view=rev Log: Created tag stable-2_21_77 Added: tags/stable-2_21_77/ -- 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] r62587 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: rpmcruz Date: Fri Oct 8 22:37:13 2010 New Revision: 62587 URL: http://svn.opensuse.org/viewcvs/yast?rev=62587&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=62587&r1=62586&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Fri Oct 8 22:37:13 2010 @@ -1 +1 @@ -2.21.76 +2.21.77 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62587&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Oct 8 22:37:13 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "76") +SET(VERSION_PATCH "77") 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 Fri Oct 8 22:37:13 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 08 21:36:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.77 +- another string review. + +------------------------------------------------------------------- Thu Oct 07 13:22:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.76 -- 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] r62586 - in /trunk/gtk/src/pkg: YGPackageSelector.cc ygtkpkgdetailview.cc ygtkpkgfilterview.cc ygtkpkgmenubar.cc ygtkpkgstatusbar.cc
by rpmcruz＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: rpmcruz Date: Fri Oct 8 22:25:32 2010 New Revision: 62586 URL: http://svn.opensuse.org/viewcvs/yast?rev=62586&view=rev Log: String review. Modified: trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/ygtkpkgfilterview.cc trunk/gtk/src/pkg/ygtkpkgmenubar.cc trunk/gtk/src/pkg/ygtkpkgstatusbar.cc 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 Fri Oct 8 22:25:32 2010 @@ -273,7 +273,7 @@ } virtual bool showMessage (Ypp::Selectable &sel, const std::string &message) - { return acceptText (sel, _("Warning Message"), _("Install anyway"), message); } + { return acceptText (sel, _("Warning Message"), _("Install anyway?"), message); } virtual bool resolveProblems (const std::list <Ypp::Problem *> &problems) { Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Fri Oct 8 22:25:32 2010 @@ -24,8 +24,12 @@ #define BROWSER_BIN "/usr/bin/firefox" #define GNOME_OPEN_BIN "/usr/bin/gnome-open" -static const char *onlyInstalledMsg = - _("Information only available for installed packages."); +static std::string onlyInstalledMsg() { + std::string s (""); + s += _("Information only available for installed packages."); + s += ""; + return s; +} #if 0 static const char *keywordOpenTag = ""; @@ -188,17 +192,14 @@ GtkWidget *item; if (g_file_test (BROWSER_BIN, G_FILE_TEST_IS_EXECUTABLE)) { - std::string label; + std::string label ("_Open"); if (getuid() == 0) { const char *username = getenv ("USERNAME"); if (!username || !(*username)) username = "root"; - label = _("_Open (as "); - label += username; - label += ")"; + label += " ("; label += _("as"); + label += " "; label += username; label += ")"; } - else - label = _("_Open"); item = gtk_image_menu_item_new_with_mnemonic (label.c_str()); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU)); @@ -776,11 +777,8 @@ inst = VersionDependencies (sel.installed()).getText (dep); if (hasCandidate) cand = VersionDependencies (sel.candidate()).getText (dep); - if (!inst.empty() || !cand.empty()) { - if (inst == cand) - cand = i + _("idem") + _i; + if (!inst.empty() || !cand.empty()) addLine (VersionDependencies::getLabel (dep), inst, cand, dep); - } } gtk_widget_show_all (vbox); } @@ -797,16 +795,17 @@ static const char *getLabel (int dep) { + switch ((zypp::Dep::for_use_in_switch) dep) { - case zypp::Dep::PROVIDES_e: return _("Provides:"); - case zypp::Dep::PREREQUIRES_e: return _("Pre-requires:"); - case zypp::Dep::REQUIRES_e: return _("Requires:"); - case zypp::Dep::CONFLICTS_e: return _("Conflicts:"); - case zypp::Dep::OBSOLETES_e: return _("Obsoletes:"); - case zypp::Dep::RECOMMENDS_e: return _("Recommends:"); - case zypp::Dep::SUGGESTS_e: return _("Suggests:"); - case zypp::Dep::ENHANCES_e: return _("Enhances:"); - case zypp::Dep::SUPPLEMENTS_e: return _("Supplements:"); + case zypp::Dep::PROVIDES_e: return "Provides:"; + case zypp::Dep::PREREQUIRES_e: return "Pre-requires:"; + case zypp::Dep::REQUIRES_e: return "Requires:"; + case zypp::Dep::CONFLICTS_e: return "Conflicts:"; + case zypp::Dep::OBSOLETES_e: return "Obsoletes:"; + case zypp::Dep::RECOMMENDS_e: return "Recommends:"; + case zypp::Dep::SUGGESTS_e: return "Suggests:"; + case zypp::Dep::ENHANCES_e: return "Enhances:"; + case zypp::Dep::SUPPLEMENTS_e: return "Supplements:"; } return 0; } @@ -894,7 +893,7 @@ if (sel.isInstalled()) ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), filelist (sel).c_str()); else - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), onlyInstalledMsg); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), onlyInstalledMsg().c_str()); } virtual void showRefreshList (Ypp::List list) {} @@ -1009,7 +1008,7 @@ if (sel.isInstalled()) ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), changelog (sel).c_str()); else - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), onlyInstalledMsg); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), onlyInstalledMsg().c_str()); } virtual void showRefreshList (Ypp::List list) {} @@ -1057,10 +1056,10 @@ { Ypp::Selectable sel = list.get (0); std::string str (authors (sel)); - if (str.empty()) - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("Not specified.")); - else - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); + if (str.empty()) { + str = ""; str += _("Attribute not-specified."); str += ""; + } + ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); } virtual void showRefreshList (Ypp::List list) {} 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 Fri Oct 8 22:25:32 2010 @@ -269,8 +269,8 @@ GtkWidget *hbox = gtk_hbox_new (FALSE, 6), *button, *icon; - // Translators: if you prefer, translate this as "Apply Patches" - button = gtk_button_new_with_label (_("Apply Patches")); + // Translators: this is shown next to the "Upgrade All" button + button = gtk_button_new_with_label (_("Only Upgrade Patches")); gtk_widget_set_sensitive (button, hasPatches); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (upgrade_patches_clicked_cb), this); Modified: trunk/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgmenubar.cc?re… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgmenubar.cc Fri Oct 8 22:25:32 2010 @@ -366,8 +366,7 @@ // Post error popup std::string str (_("Could not save to:")); str += " "; str += filename; - errorMsg (text); - g_free (text); + errorMsg (str); } g_free (filename); @@ -380,8 +379,8 @@ { const char *dirname = "/var/log/YaST2/solverTestcase"; std::string msg (_("Use this to generate extensive logs to help tracking " - "down bugs in the dependencies resolver."); - msg += "\n"; msg += _("The logs will be saved to the directory:")); + "down bugs in the dependencies resolver.")); + msg += "\n"; msg += _("The logs will be saved to the directory:"); msg += " "; msg += dirname; GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), 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 Fri Oct 8 22:25:32 2010 @@ -91,14 +91,17 @@ if (sel->toModifyAuto()) str = g_strdup_printf (_("%s %d preselected packages"), action, auto_count); else { - const char *format; - if (auto_count > 1) - format = _("%s %s, plus %d dependencies"); - else if (auto_count == 1) - format = _("%s %s, plus 1 dependency"); - else - format = "%s %s"; - str = g_strdup_printf (format, action, sel->name().c_str(), auto_count); + if (auto_count == 0) + str = g_strdup_printf ("%s %s", action, sel->name().c_str()); + else { + char *deps; + if (auto_count == 1) + deps = g_strdup (_("plus 1 dependency")); + else + deps = g_strdup_printf (_("plus %d dependencies"), auto_count); + str = g_strdup_printf ("%s %s, %s", action, sel->name().c_str(), deps); + g_free (deps); + } } gtk_label_set_markup (GTK_LABEL (text), str); -- 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] r62585 - in /trunk/gtk/src: YGUI.cc YGUI.h pkg/ygtkpkglistview.cc pkg/ygtkpkgmenubar.cc pkg/ygtkpkgundolist.cc pkg/yzypptags.cc pkg/yzyppwrapper.cc
by rpmcruz＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: rpmcruz Date: Fri Oct 8 21:06:34 2010 New Revision: 62585 URL: http://svn.opensuse.org/viewcvs/yast?rev=62585&view=rev Log: String review. Modified: trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUI.h trunk/gtk/src/pkg/ygtkpkglistview.cc trunk/gtk/src/pkg/ygtkpkgmenubar.cc trunk/gtk/src/pkg/ygtkpkgundolist.cc trunk/gtk/src/pkg/yzypptags.cc trunk/gtk/src/pkg/yzyppwrapper.cc Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=62585&r1=625… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Fri Oct 8 21:06:34 2010 @@ -45,7 +45,6 @@ YGUI::YGUI (bool with_threads) : YUI (with_threads), m_done_init (false), busy_timeout (0) { - m_have_wm = true; m_no_border = m_fullscreen = m_swsingle = false; YGUI::setTextdomain( TEXTDOMAIN ); @@ -124,23 +123,19 @@ argp++; if (argp[0] == '-') argp++; - if (!strcmp (argp, "no-wm")) - m_have_wm = false; - else if (!strcmp (argp, "fullscreen")) + if (!strcmp (argp, "fullscreen")) m_fullscreen = true; else if (!strcmp (argp, "noborder")) m_no_border = true; else if (!strcmp (argp, "help")) { printf ( - _("Command line options for the YaST2 UI (Gtk plugin):\n\n" - "--no-wm assume no window manager is running\n" - "--noborder no window manager border for main dialogs\n" - "--fullscreen use full screen for main dialogs\n" -// "--geometry WxH sets a default size of W per H to main dialogs\n" - "--nothreads run without additional UI threads\n" - "--help prints this help text\n" - "\n" - )); + _("Command line options for the YaST2 UI (GTK plugin):\n\n" + "--noborder no window manager border for main dialogs\n" + "--fullscreen use full screen for main dialogs\n" + "--nothreads run without additional UI threads\n" + "--help prints this help text\n" + "\n" + )); exit (0); } } @@ -290,7 +285,7 @@ void YGUI::askPlayMacro() { string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_OPEN, - DEFAULT_MACRO_FILE_NAME, "*.ycp", _("Select Macro File to Play")); + DEFAULT_MACRO_FILE_NAME, "*.ycp", _("Open Macro file")); if (!filename.empty()) { busyCursor(); YMacro::play (filename); @@ -312,7 +307,7 @@ } else { string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_SAVE, - DEFAULT_MACRO_FILE_NAME, "*.ycp", _("Select Macro File to Record to")); + DEFAULT_MACRO_FILE_NAME, "*.ycp", _("Save Macro")); if (!filename.empty()) YMacro::record (filename); } @@ -321,7 +316,7 @@ void YGUI::askSaveLogs() { string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_SAVE, - "/tmp/y2logs.tgz", "*.tgz *.tar.gz", _("Save y2logs to...")); + "/tmp/y2logs.tgz", "*.tgz *.tar.gz", _("Save y2logs")); if (!filename.empty()) { std::string command = "/sbin/save_y2logs"; command += " '" + filename + "'"; @@ -331,7 +326,7 @@ yuiMilestone() << "y2logs saved to " << filename << endl; else { char *error = g_strdup_printf ( - _("Error: couldn't save y2logs: \"%s\" (exit value: %d)"), + _("Could not run: '%s' (exit value: %d)"), command.c_str(), ret); yuiError() << error << endl; errorMsg (error); @@ -369,7 +364,7 @@ if (!shot) { if (interactive) - errorMsg (_("Couldn't take a screenshot.")); + errorMsg (_("Could not take screenshot.")); return; } @@ -410,7 +405,7 @@ yuiDebug() << "screenshot: " << filename << endl; filename = askForFileOrDirectory ( - GTK_FILE_CHOOSER_ACTION_SAVE, "", "*.png", _("Save screenshot to")); + GTK_FILE_CHOOSER_ACTION_SAVE, "", "*.png", _("Save screenshot")); if (filename.empty()) { // user dismissed the dialog yuiDebug() << "Save screen shot canceled by user\n"; goto makeScreenShot_ret; @@ -422,10 +417,11 @@ yuiDebug() << "Saving screen shot to " << filename << endl; if (!gdk_pixbuf_save (shot, filename.c_str(), "png", &error, NULL)) { - string msg = _("Couldn't save screenshot to file ") + filename; + string msg = _("Could not save to:"); + msg += " "; msg += filename; if (error) { - msg += "\n"; - msg += std::string ("\n") + error->message; + msg += "\n"; msg += "\n"; + msg += error->message; } yuiError() << msg << endl; if (interactive) @@ -463,7 +459,7 @@ button = GTK_STOCK_OPEN; break; case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER: case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER: - button = _("Choose"); break; + button = _("Select"); break; } GtkWidget *dialog; dialog = gtk_file_chooser_dialog_new (title.c_str(), Modified: trunk/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.h?rev=62585&r1=6258… ============================================================================== --- trunk/gtk/src/YGUI.h (original) +++ trunk/gtk/src/YGUI.h Fri Oct 8 21:06:34 2010 @@ -63,13 +63,11 @@ static gboolean busy_timeout_cb (gpointer data); // window-related arguments - bool m_have_wm, m_no_border, m_fullscreen; - bool m_swsingle; + bool m_no_border, m_fullscreen, m_swsingle; public: // Helpers for internal use [ visibility hidden ] bool setFullscreen() const { return m_fullscreen; } - bool hasWM() const { return m_have_wm; } bool unsetBorder() const { return m_no_border; } bool isSwsingle() const { return m_swsingle; } }; Modified: trunk/gtk/src/pkg/ygtkpkglistview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkglistview.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkglistview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkglistview.cc Fri Oct 8 21:06:34 2010 @@ -453,7 +453,7 @@ if (canLock) { static const char *lock_tooltip = "Package lock: prevents the package status from being modified by " - "the solver (that is, it won't honour dependencies or collections ties.)"; + "the dependencies resolver."; if (props.isLocked()) inner::appendItem (menu, _("_Unlock"), _(lock_tooltip), GTK_STOCK_DIALOG_AUTHENTICATION, true, inner::unlock_cb, pThis), empty = false; @@ -947,8 +947,11 @@ } else text = _("Not installed"); - if (sel.toModifyAuto()) - text += _("\nstatus changed by the dependency solver"); + if (sel.toModifyAuto()) { + text += "\n"; + text += _("status changed by the dependencies resolver"); + text += ""; + } return text; } Modified: trunk/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgmenubar.cc?re… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgmenubar.cc Fri Oct 8 21:06:34 2010 @@ -214,7 +214,7 @@ static void import_file_cb (GtkMenuItem *item) { - GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Import"), + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Import from"), YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); @@ -293,9 +293,9 @@ catch (const zypp::Exception & exception) { yuiWarning() << "Error reading package list from " << filename << endl; - char *text = g_strdup_printf (_("Could not load package list: '%s'"), filename); - errorMsg (text); - g_free (text); + std::string str (_("Could not open:")); + str += " "; str += filename; + errorMsg (str); } g_free (filename); @@ -307,7 +307,7 @@ static void export_file_cb (GtkMenuItem *item) { - GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export"), + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export to"), YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); @@ -364,7 +364,8 @@ g_remove (filename); // Post error popup - char *text = g_strdup_printf (_("Could not export package list: '%s'"), filename); + std::string str (_("Could not save to:")); + str += " "; str += filename; errorMsg (text); g_free (text); } @@ -378,14 +379,15 @@ static void create_solver_testcase_cb (GtkMenuItem *item) { const char *dirname = "/var/log/YaST2/solverTestcase"; - std::string msg = _("Use this to generate extensive logs to help tracking down " - "bugs in the dependency solver.\nThe logs will be stored in " - "directory: "); - msg += dirname; + std::string msg (_("Use this to generate extensive logs to help tracking " + "down bugs in the dependencies resolver."); + msg += "\n"; msg += _("The logs will be saved to the directory:")); + msg += " "; msg += dirname; GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, - "%s", _("Create Dependency Solver Test Case")); + // Translators: if there is no direct translation to Dependencies Resolver, then translate it to e.g. Dependencies Manager + "%s", _("Generate Dependencies Resolver Testcase")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", msg.c_str()); int ret = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -400,7 +402,7 @@ GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _("Success")); - msg = _("Dependency solver test case written to"); + msg = _("Dependencies resolver test case written to:"); msg += " <tt>"; msg += dirname; msg += "</tt>\n"; @@ -413,11 +415,9 @@ YGUI::ui()->askSaveLogs(); } else { - msg = _("Failed to create dependency solver test case.\n" - "Please check disk space and permissions for"); - msg += " <tt>"; - msg += dirname; - msg += "</tt>"; + msg = _("Failed to create dependencies resolver testcase.\n" + "Please check disk space and permissions for:"); + msg += " <tt>"; msg += dirname; msg += "</tt>"; errorMsg (msg.c_str()); } } @@ -686,67 +686,68 @@ Flags flags; GtkWidget *menu_bar = m_menu, *item, *submenu; - item = append_menu_item (menu_bar, _("File"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("_File"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("Import..."), NULL, + append_menu_item (submenu, _("_Import..."), NULL, G_CALLBACK (import_file_cb), this); - append_menu_item (submenu, _("Export..."), NULL, + append_menu_item (submenu, _("_Export..."), NULL, G_CALLBACK (export_file_cb), this); append_menu_item (submenu, NULL, NULL, NULL, NULL); append_menu_item (submenu, NULL, GTK_STOCK_APPLY, G_CALLBACK (accept_item_cb), selector); append_menu_item (submenu, NULL, GTK_STOCK_QUIT, G_CALLBACK (reject_item_cb), selector); if (selector->repoMgrEnabled()) { - item = append_menu_item (menu_bar, _("Configuration"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("_Configuration"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("Repositories..."), NULL, + append_menu_item (submenu, _("_Repositories..."), NULL, G_CALLBACK (repoManager), this); if (selector->onlineUpdateMode()) - append_menu_item (submenu, _("Online Update..."), NULL, + append_menu_item (submenu, _("_Online Update..."), NULL, G_CALLBACK (onlineUpdateConfiguration), this); else - append_menu_item (submenu, _("Search Packages on Web..."), NULL, + append_menu_item (submenu, _("Search Packages on _Web..."), NULL, G_CALLBACK (webpinSearch), this); } - item = append_menu_item (menu_bar, _("Dependencies"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("_Dependencies"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("Check Now"), NULL, + append_menu_item (submenu, _("_Check Now"), NULL, G_CALLBACK (manualResolvePackageDependencies), this); - new AutoCheckItem (submenu, _("Autocheck"), &flags); + new AutoCheckItem (submenu, _("_Autocheck"), &flags); if (!selector->onlineUpdateMode()) { - item = append_menu_item (menu_bar, _("Options"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("_Options"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); // Translators: don't translate the "-devel" - new ShowDevelCheckItem (submenu, _("Show -devel packages"), &flags); + new ShowDevelCheckItem (submenu, _("Show -de_vel Packages"), &flags); // Translators: don't translate the "-debuginfo/-debugsource" part - new ShowDebugCheckItem (submenu, _("Show -debuginfo/-debugsource Packages"), &flags); - new SystemVerificationCheckItem (submenu, _("System Verification Mode"), &flags); -#if ZYPP_VERSION > 6031004 + new ShowDebugCheckItem (submenu, _("Show -_debuginfo/-debugsource Packages"), &flags); + new SystemVerificationCheckItem (submenu, _("_System Verification Mode"), &flags); new CleanupDepsCheckItem (submenu, _("_Cleanup when deleting packages"), &flags); new AllowVendorChangeCheckItem (submenu, _("_Allow vendor change"), &flags); -#endif } - item = append_menu_item (menu_bar, _("Extras"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("_Extras"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("Show Products"), NULL, + append_menu_item (submenu, _("Show _Products"), NULL, G_CALLBACK (show_products_cb), this); - append_menu_item (submenu, _("Show Changes"), NULL, + append_menu_item (submenu, _("Show _Changes"), NULL, G_CALLBACK (show_pkg_changes_cb), this); if (!selector->onlineUpdateMode()) - append_menu_item (submenu, _("Show History"), NULL, + append_menu_item (submenu, _("Show _History"), NULL, G_CALLBACK (show_log_changes_cb), this); append_menu_item (submenu, NULL, NULL, NULL, NULL); - append_menu_item (submenu, _("Install All Matching -devel Packages"), NULL, + // Translators: keep "-_devel" untranslated + append_menu_item (submenu, _("Install All Matching -_devel Packages"), NULL, G_CALLBACK (install_all_devel_pkgs_cb), this); - append_menu_item (submenu, _("Install All Matching -debug-info Packages"), NULL, + // Translators: keep "-debug-_info" untranslated + append_menu_item (submenu, _("Install All Matching -debug-_sinfo Packages"), NULL, G_CALLBACK (install_all_debug_info_pkgs_cb), this); - append_menu_item (submenu, _("Install All Matching -debug-source Packages"), NULL, + // Translators: keep "-debug-_source" untranslated + append_menu_item (submenu, _("Install All Matching -debug-_source Packages"), NULL, G_CALLBACK (install_all_debug_source_pkgs_cb), this); append_menu_item (submenu, NULL, NULL, NULL, NULL); - append_menu_item (submenu, _("Generate Dependency Solver Test Case"), NULL, + append_menu_item (submenu, _("Generate Dependencies Resolver _Testcase"), NULL, G_CALLBACK (create_solver_testcase_cb), this); - append_menu_item (submenu, _("Reset Ignored Dependency Conflicts"), NULL, + append_menu_item (submenu, _("Reset _Ignored Dependencies Conflicts"), NULL, G_CALLBACK (reset_ignored_dependency_conflicts_cb), this); gtk_widget_show_all (m_menu); Modified: trunk/gtk/src/pkg/ygtkpkgundolist.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgundolist.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgundolist.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgundolist.cc Fri Oct 8 21:06:34 2010 @@ -151,15 +151,17 @@ for (ZyppDuSet::iterator it = diskUsage.begin(); it != diskUsage.end(); it++) { const ZyppDu &point = *it; if (!point.readonly && point.freeAfterCommit() < 0) { - char *str = g_strdup_printf ( - // Translators: keep the first and final "%s". They will be expanded with html code. - _("%sPartition %s is %s over-capacity (%s filled out of %s).%s"), - "", - point.dir.c_str(), point.freeAfterCommit().asString().c_str(), + // Translators: please keep the %s order intact. They refer to mount_point, needed_space + char *over = g_strdup_printf (_("Partition %s is %s over-capacity"), + point.dir.c_str(), point.freeAfterCommit().asString().c_str()); + // Translators: please keep the %s order intact. They refer to used_space, total_space + char *fill = g_strdup_printf (_("%s filled out of %s"), point.usedAfterCommit().asString().c_str(), - point.totalSize().asString().c_str(), ""); - gtk_label_set_markup (GTK_LABEL (warn_label), str); - g_free (str); + point.totalSize().asString().c_str()); + char *markup = g_strdup_printf ( + "%s (%s)", over, fill); + gtk_label_set_markup (GTK_LABEL (warn_label), markup); + g_free (over); g_free (fill); g_free (markup); gtk_widget_show (warn_label); break; } Modified: trunk/gtk/src/pkg/yzypptags.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzypptags.cc?rev=625… ============================================================================== --- trunk/gtk/src/pkg/yzypptags.cc (original) +++ trunk/gtk/src/pkg/yzypptags.cc Fri Oct 8 21:06:34 2010 @@ -49,6 +49,7 @@ case YPKG_GROUP_UNKNOWN: return _( "Unknown" ); case YPKG_GROUP_SUGGESTED: return _( "Suggested" ); case YPKG_GROUP_RECOMMENDED: return _( "Recommended" ); + // Translators: this refers to packages no longer available in any repository. case YPKG_GROUP_ORPHANED: return _( "Unmaintained" ); case YPKG_GROUP_RECENT: return _( "Recent" ); case YPKG_GROUP_MULTIVERSION: return _( "Multiversion" ); Modified: trunk/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.cc (original) +++ trunk/gtk/src/pkg/yzyppwrapper.cc Fri Oct 8 21:06:34 2010 @@ -187,12 +187,12 @@ case PATCH: { ZyppPatch patch = castZyppPatch (m_sel->theObj()); if (patch->rebootSuggested()) { - text += br + br + "" + _("Reboot required: ") + ""; + text += br + br + "" + _("Reboot required:") + " "; text += _("the system will have to be restarted in order for " "this patch to take effect."); } if (patch->reloginSuggested()) { - text += br + br + "" + _("Relogin required: ") + ""; + text += br + br + "" + _("Relogin required:") + " "; text += _("you must logout and login again for " "this patch to take effect."); } -- 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] r62584 - in /branches/SuSE-SLE-10-SP4-Branch/s390: package/yast2-s390.changes yast2-s390.spec.in
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 14:36:20 2010 New Revision: 62584 URL: http://svn.opensuse.org/viewcvs/yast?rev=62584&view=rev Log: require s390-tools only on s390 s390x Modified: branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in Modified: branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/p… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes Fri Oct 8 14:36:20 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 8 14:34:06 CEST 2010 - mzugec(a)suse.de + +- require s390-tools only on s390 s390x + +------------------------------------------------------------------- Fri Oct 8 10:08:55 CEST 2010 - mzugec(a)suse.de - 2.13.28 Modified: branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/y… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in Fri Oct 8 14:36:20 2010 @@ -2,7 +2,10 @@ @HEADER@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite + +%ifarch s390 s390x Requires: yast2 s390-tools +%endif Summary: Configuration of s390 -- 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] r62583 - in /trunk/control-center: VERSION.cmake package/yast2-control-center.changes
by tgoettlicher＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: tgoettlicher Date: Fri Oct 8 12:34:09 2010 New Revision: 62583 URL: http://svn.opensuse.org/viewcvs/yast?rev=62583&view=rev Log: version Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev… ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Fri Oct 8 12:34:09 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Fri Oct 8 12:34:09 2010 @@ -2,6 +2,7 @@ Fri Oct 8 12:32:21 CEST 2010 - tgoettlicher(a)suse.de - fixed: bnc #644856: wrong systemsetting category +- 2.19.2 ------------------------------------------------------------------- Thu Mar 11 13:51:41 CET 2010 - kmachalkova(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] r62582 - in /trunk/control-center: package/yast2-control-center.changes src/YaST-systemsettings.desktop
by tgoettlicher＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: tgoettlicher Date: Fri Oct 8 12:33:40 2010 New Revision: 62582 URL: http://svn.opensuse.org/viewcvs/yast?rev=62582&view=rev Log: fixed Bug 644856 - wrong systemsetting category Modified: trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/YaST-systemsettings.desktop Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Fri Oct 8 12:33:40 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 8 12:32:21 CEST 2010 - tgoettlicher(a)suse.de + +- fixed: bnc #644856: wrong systemsetting category + +------------------------------------------------------------------- Thu Mar 11 13:51:41 CET 2010 - kmachalkova(a)suse.cz - Integrate YaST with new KControl - it is ExternaApp, not KCModule Modified: trunk/control-center/src/YaST-systemsettings.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/YaST-systemse… ============================================================================== --- trunk/control-center/src/YaST-systemsettings.desktop (original) +++ trunk/control-center/src/YaST-systemsettings.desktop Fri Oct 8 12:33:40 2010 @@ -5,5 +5,5 @@ GenericName=Administrator Settings Exec=kdesu -c /sbin/yast2 X-KDE-RootOnly=true -X-KDE-System-Settings-Parent-Category=system +X-KDE-System-Settings-Parent-Category=system-administration X-KDE-ServiceTypes=SystemSettingsExternalApp -- 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] r62581 - /tags/branch-SLE-10-SP4-2_13_28/s390/
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 10:12:56 2010 New Revision: 62581 URL: http://svn.opensuse.org/viewcvs/yast?rev=62581&view=rev Log: Created tag branch-SLE-10-SP4-2_13_28 for s390 Added: tags/branch-SLE-10-SP4-2_13_28/s390/ - copied from r62580, branches/SuSE-SLE-10-SP4-Branch/s390/ -- 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] r62580 - /tags/branch-SLE-10-SP4-2_13_28/
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 10:12:53 2010 New Revision: 62580 URL: http://svn.opensuse.org/viewcvs/yast?rev=62580&view=rev Log: Created tag branch-SLE-10-SP4-2_13_28 Added: tags/branch-SLE-10-SP4-2_13_28/ -- 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] r62579 - in /branches/SuSE-SLE-10-SP4-Branch/s390: VERSION package/yast2-s390.changes src/dump/helps.ycp
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 10:12:46 2010 New Revision: 62579 URL: http://svn.opensuse.org/viewcvs/yast?rev=62579&view=rev Log: fixed help text (bnc#529149) Modified: branches/SuSE-SLE-10-SP4-Branch/s390/VERSION branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes branches/SuSE-SLE-10-SP4-Branch/s390/src/dump/helps.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/V… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/VERSION Fri Oct 8 10:12:46 2010 @@ -1 +1 @@ -2.13.27 +2.13.28 Modified: branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/p… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes Fri Oct 8 10:12:46 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 8 10:08:55 CEST 2010 - mzugec(a)suse.de + +- 2.13.28 +- fixed help text (bnc#529149) + +------------------------------------------------------------------- Fri Oct 8 09:25:09 CEST 2010 - mzugec(a)suse.de - error messages more verbose for dump module (bnc#525440) Modified: branches/SuSE-SLE-10-SP4-Branch/s390/src/dump/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/s… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/src/dump/helps.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/src/dump/helps.ycp Fri Oct 8 10:12:46 2010 @@ -51,7 +51,7 @@ /* Disk add help 1/3 */ "edit_dump" : _("<big>Add New Dump Device</big> Prepare a device for use as an S/390 dump device. Supported devices are -ECKD DASD and zfcp disks. Set Dump Device to select the device +ECKD DASD. Set Dump Device to select the device to format. If the device is already formatted or configured, setting Install Dump Record Even If Disk Already &Formatted is required."), -- 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] r62578 - /tags/branch-SLE-10-SP4-2_13_27/s390/
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 09:39:36 2010 New Revision: 62578 URL: http://svn.opensuse.org/viewcvs/yast?rev=62578&view=rev Log: Created tag branch-SLE-10-SP4-2_13_27 for s390 Added: tags/branch-SLE-10-SP4-2_13_27/s390/ - copied from r62577, branches/SuSE-SLE-10-SP4-Branch/s390/ -- 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] r62577 - /tags/branch-SLE-10-SP4-2_13_27/
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 09:39:33 2010 New Revision: 62577 URL: http://svn.opensuse.org/viewcvs/yast?rev=62577&view=rev Log: Created tag branch-SLE-10-SP4-2_13_27 Added: tags/branch-SLE-10-SP4-2_13_27/ -- 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] r62576 - in /branches/SuSE-SLE-10-SP4-Branch/s390: VERSION package/yast2-s390.changes src/modules/Dump.ycp
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 09:37:18 2010 New Revision: 62576 URL: http://svn.opensuse.org/viewcvs/yast?rev=62576&view=rev Log: error messages more verbose for dump module (bnc#525440) Modified: branches/SuSE-SLE-10-SP4-Branch/s390/VERSION branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/Dump.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/V… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/VERSION Fri Oct 8 09:37:18 2010 @@ -1 +1 @@ -2.13.26 +2.13.27 Modified: branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/p… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes Fri Oct 8 09:37:18 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 8 09:25:09 CEST 2010 - mzugec(a)suse.de + +- error messages more verbose for dump module (bnc#525440) +- 2.13.27 + +------------------------------------------------------------------- Fri Nov 6 10:02:23 CET 2009 - mzugec(a)suse.cz - dasd: display DIAG mode (bnc#551268) Modified: branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/Dump.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/s… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/Dump.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/Dump.ycp Fri Oct 8 09:37:18 2010 @@ -160,6 +160,15 @@ else if (ret == 2) // error description err = _("Support program not installed."); + else if (ret == 11) + // error description + err = _("Invalid or unuseable disk (fatal)."); + else if (ret == 12) + // error description + err = _("Minor error, can be corrected with -f."); + else if (ret == 13) + // error description + err = _("Missing support programs."); else // error description err = _("Error code from support program."); -- 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] r62575 - /branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml
by jsrain＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: jsrain Date: Thu Oct 7 14:36:22 2010 New Revision: 62575 URL: http://svn.opensuse.org/viewcvs/yast?rev=62575&view=rev Log: removed duplicated upgrade workflow Modified: branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml Modified: branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml (original) +++ branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml Thu Oct 7 14:36:22 2010 @@ -893,89 +893,6 @@ <workflow> <stage>continue</stage> - <mode>update</mode> - <defaults> - <archs>all</archs> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </defaults> - <modules config:type="list"> - <module> - <label>Perform Update</label> - <name>rpmcopy_secondstage</name> - </module> - <module> - <heading>yes</heading> - <label>Configuration</label> - </module> - <module> - <label>Network</label> - <name>upgrade_ask_net_test</name> - <execute>inst_ask_net_test</execute> -  - <enable_back>no</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Network</label> - <name>upgrade_do_net_test</name> - <execute>inst_do_net_test</execute> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Customer Center</label> - <name>upgrade_addon_update_sources</name> - <execute>inst_addon_update_sources</execute> - </module> - <module> - <label>Customer Center</label> - <name>upgrade_suse_register</name> - <execute>inst_suse_register</execute> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Online Update</label> - <name>upgrade_ask_online_update</name> - <execute>inst_ask_online_update</execute> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Online Update</label> - <name>upgrade_you</name> - <execute>inst_you</execute> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Online Update</label> - <name>upgrade_restore_settings</name> - <execute>inst_restore_settings</execute> - </module> - <module> - <name>upgrade_suseconfig</name> - <execute>inst_suseconfig</execute> - </module> - <module> - <label>Release Notes</label> - <name>upgrade_release_notes</name> - <execute>inst_release_notes</execute> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <name>upgrade_congratulate</name> - <execute>inst_congratulate</execute> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - </modules> - </workflow> - - <workflow> - <stage>continue</stage> <mode>installation</mode> <defaults> <enable_back>yes</enable_back> -- 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] r62574 - /tags/stable-2_21_76/gtk/
by rpmcruz＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: rpmcruz Date: Thu Oct 7 14:23:11 2010 New Revision: 62574 URL: http://svn.opensuse.org/viewcvs/yast?rev=62574&view=rev Log: Created tag stable-2_21_76 for gtk Added: tags/stable-2_21_76/gtk/ - copied from r62573, 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] r62573 - /tags/stable-2_21_76/
by rpmcruz＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: rpmcruz Date: Thu Oct 7 14:23:04 2010 New Revision: 62573 URL: http://svn.opensuse.org/viewcvs/yast?rev=62573&view=rev Log: Created tag stable-2_21_76 Added: tags/stable-2_21_76/ -- 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] r62572 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: rpmcruz Date: Thu Oct 7 14:23:01 2010 New Revision: 62572 URL: http://svn.opensuse.org/viewcvs/yast?rev=62572&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=62572&r1=62571&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Thu Oct 7 14:23:01 2010 @@ -1 +1 @@ -2.21.75 +2.21.76 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62572&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Thu Oct 7 14:23:01 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "75") +SET(VERSION_PATCH "76") 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 Thu Oct 7 14:23:01 2010 @@ -1,37 +1,19 @@ ------------------------------------------------------------------- -Mon Oct 04 16:21:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt +Thu Oct 07 13:22:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt -- 2.21.75 +- 2.21.76 - sw_single: run solver at end, fixes bnc#620513. +- rpm spec fix (now compatible with both 11.3 and factory). - got rid of included FindGTK2.cmake module. - overall string review. - text domain changed from "yast2-gtk" to "gtk". ------------------------------------------------------------------- -Thu Sep 30 18:32:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt +Mon Aug 30 10:48:27 CEST 2010 - vuntz(a)opensuse.org -- 2.21.74 -- rpm spec fix (now compatible for both 11.3 and factory). - -------------------------------------------------------------------- -Tue Sep 14 14:48:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - -- 2.21.73 -- sw_single: run solver at end, fixes bnc#620513. - -------------------------------------------------------------------- -Mon Aug 30 18:05:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - -- 2.21.72 -- temporarily reverting cmake fixes: we need a 11.3 version -built in order to issue a patch. - -------------------------------------------------------------------- -Mon Aug 30 17:45:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - -- 2.21.71 -- fix compilation error on Factory (bnc#635352) -- uploading the 11.3 branch for patching purposes (bnc#624310). +- Add yast2-gtk-fix-FindGTK2-gdk-pixbuf.patch to fix build with + gtk2 2.21.x: gdk-pixbuf was split and the include paths are + different now. ------------------------------------------------------------------- Mon Aug 23 00:40:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt -- 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] r62571 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: gs Date: Thu Oct 7 14:19:41 2010 New Revision: 62571 URL: http://svn.opensuse.org/viewcvs/yast?rev=62571&view=rev Log: fix minor bug of pre tag implementation Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=62… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Thu Oct 7 14:19:41 2010 @@ -461,14 +461,16 @@ break; case L'<': - swch = wch; - SkipToken( wch ); - - if ( PadTOKEN( swch, wch ) ) - break; // strip token - else - wch = swch; // reset and fall through + if ( !preTag ) + { + swch = wch; + SkipToken( wch ); + if ( PadTOKEN( swch, wch ) ) + break; // strip token + else + wch = swch; // reset and fall through + } default: swch = wch; @@ -481,6 +483,7 @@ { SkipPreTXT( wch ); PadPlainTXT( swch, wch - swch ); + preTag = false; } break; -- 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] r62570 - /trunk/ycp-ui-bindings/examples/RichText3.ycp
by gs＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: gs Date: Thu Oct 7 14:12:40 2010 New Revision: 62570 URL: http://svn.opensuse.org/viewcvs/yast?rev=62570&view=rev Log: improve examples for pre tag Modified: trunk/ycp-ui-bindings/examples/RichText3.ycp Modified: trunk/ycp-ui-bindings/examples/RichText3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText3.ycp (original) +++ trunk/ycp-ui-bindings/examples/RichText3.ycp Thu Oct 7 14:12:40 2010 @@ -7,27 +7,24 @@ + "It's very much like HTML, but not quite as powerful." + "Text in pre tags preserves newlines and spaces." + "<pre>" - + "\n" + " host ip adress host ip adress\n" + " sturm 10.10.0.159 sturm 10.10.0.159\n\n" + "Lines are not wrapped; in text mode HTML tags are not removed if the pre tag is used, " + "but entities like product: &product; are filtered and shown correctly.\n" - + "\n" + "</pre>" + "After /pre the text is HTML text like before." + "Much much more text .............. continous" + " much much more text .... follows " + " much much more text ................." - + "" - + "<pre>another pre t t </pre>" - + "and much more text after pre is closed, now HTML text " + + "<pre>another pre t t </pre>" + + "and more text after pre is closed, now HTML text " + "" - + "<pre>" + + "<pre>Another text in pre preserving spaces and newlines\n" + " host ip adress host ip adress\n" + " sturm 10.10.0.159 sturm 10.10.0.159\n" + "Lines are not wrapped; in text mode HTML tags are not removed if the pre tag is used.\n" + "</pre>" - + "and even much more text but now not wrapped at old place but with new layout of the pad widget which is underlying the richtext widget" + + "And after closing pre tag much more text - long long long long long lines are now wrapped again, this is a very very very very long long long long long long line Even longer and longer" + "<pre>And another short pre</pre>" ), `PushButton(`opt(`default), "&OK") -- 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] r62569 - /tags/stable-2_21_75/gtk/
by rpmcruz＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: rpmcruz Date: Thu Oct 7 13:48:08 2010 New Revision: 62569 URL: http://svn.opensuse.org/viewcvs/yast?rev=62569&view=rev Log: Created tag stable-2_21_75 for gtk Added: tags/stable-2_21_75/gtk/ - copied from r62568, 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] r62568 - /tags/stable-2_21_75/
by rpmcruz＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: rpmcruz Date: Thu Oct 7 13:48:02 2010 New Revision: 62568 URL: http://svn.opensuse.org/viewcvs/yast?rev=62568&view=rev Log: Created tag stable-2_21_75 Added: tags/stable-2_21_75/ -- 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] r62567 - in /trunk/gtk: VERSION VERSION.cmake
by rpmcruz＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: rpmcruz Date: Thu Oct 7 13:47:59 2010 New Revision: 62567 URL: http://svn.opensuse.org/viewcvs/yast?rev=62567&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62567&r1=62566&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Thu Oct 7 13:47:59 2010 @@ -1 +1 @@ -2.21.68 +2.21.75 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62567&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Thu Oct 7 13:47:59 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "68") +SET(VERSION_PATCH "75") -- 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] r62566 - in /trunk/ycp-ui-bindings/examples: LICENSE.mp3.txt flash-player-license.txt
by gs＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: gs Date: Thu Oct 7 13:41:17 2010 New Revision: 62566 URL: http://svn.opensuse.org/viewcvs/yast?rev=62566&view=rev Log: more licenses for testing with RichText-license.ycp Added: trunk/ycp-ui-bindings/examples/LICENSE.mp3.txt trunk/ycp-ui-bindings/examples/flash-player-license.txt Added: trunk/ycp-ui-bindings/examples/LICENSE.mp3.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/LICENSE… ============================================================================== --- trunk/ycp-ui-bindings/examples/LICENSE.mp3.txt (added) +++ trunk/ycp-ui-bindings/examples/LICENSE.mp3.txt Thu Oct 7 13:41:17 2010 @@ -0,0 +1,175 @@ +FLUENDO MP3 PLUG-IN FOR GSTREAMER COMMERCIAL LICENSE +AGREEMENT BY FLUENDO, S.A. (âFLUENDOâ) + +IMPORTANT â READ CAREFULLY +THE FOLLOWING LICENSE AGREEMENT AS AMENDED FROM TIME TO TIME AND +AVAILABLE WITH THIS PACKAGE (THE âLICENSE AGREEMENTâ)GOVERNS THE +DOWNLOADING, INSTALLATION AND/OR USE OF FLUENDOâS PROPRIETARY SOFTWARE +âMP3 PLUG-IN FOR GSTREAMERâ, INCLUDING ANY COMPONENTS, +COPIES, UPDATES,ENHANCEMENTS, UPGRADES OR SUBSEQUENT VERSIONS THEREOF +THAT MAY BE RELEASED BY FLUENDO (COLLECTIVELY, THE âSOFTWAREâ) AND ANY +ACCOMPANYING MANUALS, HELP FILES AND DOCUMENTATION (THE "DOCUMENTATION"). +PLEASE READ THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT AS BY +DOWNLOADING, USING AND/OR INSTALLING THE SOFTWARE YOU (THE âLICENSEEâ) +CONSENT AND AGREE TO BE BOUND BY ALL OF THE TERMS AND CONDITIONS OF THIS +LICENSE AGREEMENT. YOU MAY DOWNLOAD, INSTALL AND/OR USE THE SOFTWARE +SUBJECT TO THOSE TERMS AND CONDITIONS AND TO ANY APPLICABLE LAW, BEING +SOLELY LIABLE FOR ANY BREACH THEREOF. IF YOU DO NOT AGREE TO THIS +LICENSE AGREEMENT, FLUENDO DOES NOT GRANT ANY LICENSE TO YOU FOR THE +SOFTWARE AND YOU MAY NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE. + +GRANT OF LICENSE AND RESTRICTIONS +1. Subject to the Licenseeâs acceptance and continued compliance with + this License Agreement, Fluendo hereby grants the + Licensee a non-exclusive, non-transferable limited license to install, + use or otherwise benefit from the functionality of the Software in the + manner and for the purposes described in the Documentation, on a per + computer basis. + +2. Except as expressly authorized by Fluendo in writing, it is forbidden to: + (i) decompile, reverse engineer, disassemble or decode the Software + or any copy, adaptation, transcription or merged portion of the + Software; + (ii) attempt to ascertain the source code of the Software or any of its + components by any means, nor modify, adapt, translate or create + derivative works based on the Software; + (iii) tamper or interfere with the functionality, delivery or operation + of the Software while using or installing it; + (iv) sell, resell, rent, lease, distribute, transfer, assign, sublicense + or otherwise deal with the Software, its components, the Documentation + or any of the rights granted under this License Agreement; + (v) duplicate, reproduce or copy (except for reasonable backup purposes) + the Software or the Documentation; or + (vi) export or re-export the Software, directly or indirectly, into any + country prohibited by law. + +3. It is prohibited to modify, remove, suppress, or in any other way make + inconspicuous the copyright, digital fingerprints, watermarks, + identification labels, legal notices contained within the Software or + other technical protection devices or data identifying Fluendoâs or its + licensors rights in the Software, its files or its components. + +4. No right is granted herein to any third party to use the Software, to + the Licensee to use the Software for any third party, or to the Licensee + to utilize the Software for any purpose whatsoever not described herein. + +OWNERSHIP +5. Save for the right to use the Software and the Documentation + expressly provided for in this License Agreement, the Licensee agrees + and acknowledges that all title to and rights in the Software, its + components, structure, databases, source code or design, and in the + Documentation, including without limitation all copyright trademarks, + trade secrets, patents, and all other intellectual or industrial + property rights and other confidential or proprietary information + contained therein remain the property of Fluendo or its licensors. + +LIABILITY +6. TO THE MAXIMUM EXTENT PERMITTED BY LAW, AND PROVIDED THAT LIABILITY + SHALL NOT BE EXCLUDED OR LIMITED IN RESPECT OF MALICIOUS INTENT OR GROSS + NEGLIGENCE, FLUENDO HEREBY EXCLUDES ALL LIABILITY IN RESPECT OF: + +a) ANY LOSS, DAMAGES, CLAIMS OR COSTS WHATSOEVER INCLUDING ANY + CONSEQUENTIAL, INDIRECT OR INCIDENTAL DAMAGES, ANY LOST PROFITS OR LOST + SAVINGS, ANY DAMAGES RESULTING FROM BUSINESS INTERRUPTION, OR CLAIMS BY + A THIRD PARTY, EVEN IF A FLUENDO REPRESENTATIVE HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS. +b) DAMAGES, CLAIMS OR LIABILITIES ARISING OUT OF ANY OF THE FOLLOWING: + (i) THE CONTENT (INCLUDING WITHOUT LIMITATION ITS NATURE OR ANY + INTELLECTUAL PROPERTY RIGHTS THEREIN) AND/OR ANY OTHER DATA, IMAGES, + VIDEOS OR SOUNDS WHATSOEVER THAT THE LICENSEE MAY ACCESS OR TRANSMIT + USING THE SOFTWARE; + (ii) LIABILITY TO ANY EMPLOYER, PRINCIPAL, CLIENT, LESSOR OR PROVIDER OF + COMPUTER EQUIPMENT OR FACILITIES, ARISING OUT OF THE INSTALLATION OF OR + USE OF THE SOFTWARE; + (iii) ANY CHARGES WHICH THE LICENSEE MAY INCUR TO ANY TELECOMMUNICATIONS + SERVICE OR NETWORK. + +7. FLUENDO EXPRESSLY EXCLUDES ALL LIABILITY IN CONNECTION WITH ANY THIRD + PARTY APPLICATIONS OR THIRD PARTY COMPONENTS THAT MAY BE INCLUDED WITHIN + THE SOFTWARE, OR YOUR USE THEREOF. + +8. TO THE MAXIMUM EXTENT PERMITTED BY LAW, FLUENDOâS AGGREGATE LIABILITY + AND THAT OF ITS AFFILIATES AND SUPPLIERS UNDER OR IN CONNECTION WITH + THIS LICENSE AGREEMENT WILL BE LIMITED IN ANY CASE TO THE AMOUNT PAID + FOR THE SOFTWARE, IF ANY, OR, IF HIGHER, TO THE MINIMUM AMOUNT + STIPULATED BY A COMPULSORY LAW. + +INDEMNITY +9. BY DOWNLOADING, INSTALLING, USING OR UNINSTALLING THE SOFTWARE, THE + LICENSEE HEREBY AGREES TO, AT ITS OWN EXPENSE, INDEMNIFY, DEFEND AND + HOLD HARMLESS FLUENDO, ITS PARENTS, SUBSIDIARIES AND AFFILIATES, ITS + BUSINESS PARTNERS, AND ITS AND THEIR RESPECTIVE DIRECTORS, OFFICERS, + EMPLOYEES AND AGENTS FROM AND AGAINST ANY AND ALL LOSSES, DAMAGES, + INJURIES, CAUSES OF ACTION, CLAIMS, DEMANDS AND EXPENSES, INCLUDING + LEGAL FEES AND EXPENSES, OF WHATEVER KIND OR NATURE ARISING OUT OF, + RELATING TO OR RESULTING FROM ANY CLAIM ARISING FROM OR RELATING TO (I) + ANY BREACH BY THE LICENSEE OF THIS LICENSE AGREEMENT; OR (II) THE + LICENSEEâS DOWNLOAD, INSTALLATION, USE OR UNINSTALLATION OF THE + SOFTWARE. + +TERMINATION +10. This grant of license begins upon acceptance by the Licensee, either + expressly or through use or possession of the Software, and shall + continue until terminated as provided in this License Agreement. + +11. The Licensee may terminate this License Agreement at any time by + uninstalling the Software and destroying all copies of the Software. + Upon any termination, the Licensee agrees to uninstall the Software and + return or destroy all copies of the Software, the Documentation, and all + other associated materials. + +12. The Licenseeâs failure to comply with any of the terms and conditions + of this License Agreement terminates the Licenseeâs right to use the + Software and/or the Documentation, and the Licensee will not receive a + refund. + +CONFIDENTIALITY +13. The Software, the Documentation, the terms of this License Agreement + and any other related material or data disclosed by Fluendo to the + Licensee will be confidential (âConfidential Informationâ) and the + Licensee will not disclose such Confidential Information in any form to + any third party without the express written consent of Fluendo, except + to the extent that such information: (a) is previously known to the + Licensee; (b) becomes publicly known or independently generated through + no breach of this obligation; (c) is acquired by the Licensee from a + third party which was not under an obligation to Fluendo not to disclose + such information; or (d) is required to be disclosed by a court or + regulatory or legislative order or provision. + +14. The Licensee will keep the Software and the Documentation in + confidence in perpetuity, will take all measures necessary to protect + and maintain the confidential and proprietary character of the Software + and the Documentation, and will indemnify Fluendo from all losses and + damages resulting from unauthorized or improper disclosure, + dissemination or use of the Software or the Documentation, as a result, + in whole or in part, of the Licenseeâs action or inaction. + +GENERAL +15. This License Agreement contains the entire agreement between the + Licensee and Fluendo with respect to the subject matter hereof and + supersedes all prior agreements, negotiations, representations of any + kind and proposals, written and oral, relating to its subject matter. + +16. If any provision of this License Agreement is declared by a court of + competent jurisdiction to be invalid, illegal or unenforceable, such + provision shall be severed from this License Agreement and the other + provisions shall remain in full force and effect. + +17. All notices given by either party to the other pursuant to this + License Agreement shall be in writing and delivered at its principal + place of business by fax or delivery service (in either case with + acknowledgement of receipt). + +18. The waiver or failure of Fluendo to exercise in any respect any + rights provided for in this License Agreement shall not be deemed a + waiver of any actual or further right under this License Agreement. + +19. This License Agreement shall be governed by and construed in + accordance with the laws of Spain, and the parties submit to the + exclusive jurisdiction of the Courts and Tribunals of Barcelona in + connection with all matters arising under this License Agreement. + +FLUENDO, S.A. +C.I.F.: A-64001217 +World Trade Center Edificio Norte, 2 pl. +08039 Barcelona Added: trunk/ycp-ui-bindings/examples/flash-player-license.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/flash-p… ============================================================================== --- trunk/ycp-ui-bindings/examples/flash-player-license.txt (added) +++ trunk/ycp-ui-bindings/examples/flash-player-license.txt Thu Oct 7 13:41:17 2010 @@ -0,0 +1,80 @@ +<pre width="72"><tt>ADOBEÂ® SOFTWARE LICENSE AGREEMENT + +NOTICE TO USER: PLEASE READ THIS CONTRACT CAREFULLY. BY USING, COPYING OR DISTRIBUTING ALL OR ANY PORTION OF THE ADOBE SOFTWARE ("SOFTWARE") YOU ACCEPT ALL THE TERMS AND CONDITIONS OF THIS AGREEMENT, INCLUDING, IN PARTICULAR THE LIMITATIONS ON: USE CONTAINED IN SECTION 2; TRANSFERABILITY IN SECTION 4; WARRANTY IN SECTION 7; AND LIABILITY IN SECTION 8. YOU AGREE THAT THIS AGREEMENT IS ENFORCEABLE LIKE ANY WRITTEN NEGOTIATED AGREEMENT SIGNED BY YOU. THIS AGREEMENT IS ENFORCEABLE AGAINST YOU AND ANY LEGAL ENTITY THAT OBTAINED THE SOFTWARE AND ON WHOSE BEHALF IT IS USED. IF YOU DO NOT AGREE, DO NOT USE THIS SOFTWARE. + +Adobe and its suppliers own all intellectual property in the Software. Adobe permits you to Use the Software only in accordance with the terms of this Agreement. Use of some third party materials included in the Software may be subject to other terms and conditions typically found in a separate license agreement, a "Read Me" file located near such materials or in the "Third Party Software Notices and/or Additional Terms and Conditions" found at www.adobe.com/go/thirdparty/ + +1. Definitions. "Software" means (a) all of the contents of the files (provided either by electronic download, on physical media or any other method of distribution), disk(s), CD-ROM(s) or other media with which this Agreement is provided, including but not limited to (i) Adobe or third party computer information or software, including the Adobe ReaderÂ® ("Adobe Reader"), Adobe FlashÂ® Player, ShockwaveÂ® Player and AuthorwareÂ® Player (collectively, the Flash, Shockwave and Authorware players, are the "Web Players"); (ii) related explanatory written materials or files ("Documentation"); and (iii) fonts; and (b) upgrades, modified versions, updates, additions, and copies of the Software, if any, licensed to you by Adobe (collectively, "Updates"). "Use" or "Using" means to access, install, download, copy, or otherwise benefit from using the functionality of the Software in accordance with the Docume ntation. "Permitted Number" means one (1) unless otherwise indicated under a valid license (e.g., volume license) granted by Adobe. "Computer" means an electronic device that accepts information in digital or similar form and manipulates it for a specific result based on a sequence of instructions. "Adobe" means Adobe Systems Incorporated, a Delaware corporation, 345 Park Avenue, San Jose, California 95110, if subsection 9(a) of this Agreement applies; otherwise it means Adobe Systems Software Ireland Limited, Unit 3100, Lake Drive, City West Campus, Saggart D24, Republic of Ireland, a company organized under the laws of Ireland and an affiliate and licensee of Adobe Systems Incorporated. +2. Software License. If you obtained the Software from Adobe or one of its authorized licensees, and subject to your compliance with the terms of this agreement (this "Agreement"), including the restrictions in Setion 3, Adobe grants to you a non-exclusive license to Use the Software for the purposes described in the Documentation as follows. + +2.1 General Use. You may install and Use a copy of the Software on your compatible Computer, up to the Permitted Number of computers. The Software may not be shared, installed or used concurrently on different computers. See Section 3 for important restrictions on the Use of Adobe Reader and Web Players. + +2.2 Server Use and Distribution. + +2.2.1 You may install one copy of the Adobe Reader on a computer file server within your internal network for the sole and exclusive purpose of (a) using the Software (from an unlimited number of client computers on your internal network) via (i) the Network File System (NFS) for UNIX versions of the Software or (ii) Windows Terminal Services and (b) allowing for printing within your internal network. Unless otherwise expressly permitted hereunder, no other server or network use of the Software is permitted, including but not limited to use of the Software (i) either directly or through commands, data or instructions from or to another computer or (ii) for internal network, internet or web hosting services. + +2.2.2 For information on how to distribute the Software on tangible media or through an internal network please refer to the sections entitled "How to Distribute Adobe Reader" at http://www.adobe.com/products/acrobat/distribute.html; or "Distribute Macromedia Web Players" at http://www.adobe.com/licensing. + +2.3 Backup Copy. You may make one backup copy of the Software, provided your backup copy is not installed or used on any Computer. You may not transfer the rights to a backup copy unless you transfer all rights in the Software as provided under Section 4. + +2.4 Portable or Home Computer Use. If and only if the Software is Adobe Reader, in addition to the single copy permitted under Sections 2.1 and 2.2, the primary user of the Computer on which the Software is installed may make a second copy of the Software for his or her exclusive Use on either a portable Computer or a Computer located at his or her home, provided the Software on the portable or home Computer is not used at the same time as the Software on the primary computer. + +2.5 No Modification. + +2.5.1 You may not modify, adapt, translate or create derivative works based upon the Software. You may not reverse engineer, decompile, disassemble or otherwise attempt to discover the source code of the Software except to the extent you may be expressly permitted to decompile under applicable law, it is essential to do so in order to achieve operability of the Software with another software program, and you have first requested Adobe to provide the information necessary to achieve such operability and Adobe has not made such information available. Adobe has the right to impose reasonable conditions and to request a reasonable fee before providing such information. Any such information supplied by Adobe and any information obtained by you by such permitted decompilation may only be used by you for the purpose described herein and may not be disclosed to any third party or used to create any software which is substantially similar to the expression of the Software. Requests for information should be directed to the Adobe Customer Support Department. + +2.5.2 As an exception to the above, you may customize or extend the functionality of the installer for the Adobe Reader as specifically allowed by instructions found at http://www.adobe.com/support/main.html or http://partners.adobe.com (e.g., installation of additional plug-in and help files). You may not otherwise alter or modify the Software or create a new installer for the Software. The Adobe Reader is licensed and distributed by Adobe for viewing, distributing and sharing PDF files. + +2.6 Third Party Website Access. The Software may allow you to access third party websites ("Third Party Sites"). Your access to and use of any Third Party Sites, including any goods, services or information made available from such sites, is governed by the terms and conditions found at each Third Party Site, if any. Third Party Sites are not owned or operated by Adobe. YOUR USE OF THIRD PARTY SITES IS AT YOUR OWN RISK. ADOBE MAKES NO WARRANTIES, CONDITIONS, INDEMNITIES, REPRESENTATIONS OR TERMS, EXPRESS OR IMPLIED, WHETHER BY STATUTE, COMMON LAW, CUSTOM, USAGE OR OTHERWISE AS TO ANY OTHER MATTERS, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT OF THIRD PARTY RIGHTS, TITLE, INTEGRATION, ACCURACY, SECURITY, AVAILABILITY, SATISFACTORY QUALITY, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE WITH RESPECT TO THE THIRD PARTY SITES. + +2.7 Certified Documents. + +2.7.1 Certified Documents and CD Services. The Software may allow you to validate Certified Documents. A "Certified Document" or "CD" is a PDF file that has been digitally signed using (a) a certificate and (b) a "private" encryption key that corresponds to the "public" key in the certificate. Validation of a CD requires CD Services from the CD Service Provider that issued the certificate. "CD Service Provider" is an independent third party service vendor listed at http://www.adobe.com/security/partners_cds.html. "CD Services" are services provided by CD Service Providers, including without limitation (i) certificates issued by such CD Service Provider for use with the Software's CD feature set, (ii) services related to issuance of certificates, and (iii) other services related to certificates, including without limitation verification services. + +2.7.2 CD Service Providers. Although the Software may provide validation features, Adobe does not supply the necessary CD Services required to use these features. Purchasing, availability and responsibility for the CD Services are between you and the CD Service Provider. Before you rely upon any CD, any digital signature applied thereto, and/or any related CD Services, you must first review and agree to the applicable Issuer Statement and this Agreement. "Issuer Statement" means the terms and conditions under which each CD Service Provider offers CD Services (see the links on http://www.adobe.com/security/partners_cds.html) including for example any subscriber agreements, relying party agreements, certificate policies and practice statements, and Section 2.7 of this Agreement. By validating a CD using CD Services, you acknowledge and agree that (a) the certificate used to digitally sign a CD may be revoked at the time of verification, making the digital signature on the CD appear valid when in fact it is not, (b) the security or integrity of a CD may be compromised due to an act or omission by the signer of the CD, the applicable CD Service Provider, or any other third party and (c) you must read, understand, and be bound by the applicable Issuer Statement. + +2.7.3 Warranty Disclaimer. CD Service Providers offer CD Services solely in accordance with the applicable Issuer Statement. ACCESS TO THE CD SERVICES THROUGH THE USE OF THE SOFTWARE IS MADE AVAILABLE ON AN ÂAS ISÂ BASIS ONLY AND WITHOUT ANY WARRANTY OR INDEMNITY OF ANY KIND (EXCEPT AS SUPPLIED BY A CD SERVICES PROVIDER IN ITS ISSUER STATEMENT). ADOBE AND EACH CD SERVICE PROVIDER (EXCEPT AS EXPRESSLY PROVIDED IN ITS ISSUER STATEMENT) MAKE NO WARRANTIES, CONDITIONS, INDEMNITIES, REPRESENTATIONS OR TERMS, EXPRESS OR IMPLIED, WHETHER BY STATUTE, COMMON LAW, CUSTOM, USAGE OR OTHERWISE AS TO ANY OTHER MATTERS, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT OF THIRD PARTY RIGHTS, TITLE, INTEGRATION, ACCURACY, SECURITY, AVAILABILITY, SATISFACTORY QUALITY, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE WITH RESPECT TO THE CD SERVICES. + +2.7.4 Indemnity. You agree to hold Adobe and any applicable CD Service Provider (except as expressly provided in its Issuer Statement) harmless from any and all liabilities, losses, actions, damages, or claims (including all reasonable expenses, costs, and attorneys fees) arising out of or relating to any use of, or reliance on, any CD Service, including, without limitation (a) reliance on an expired or revoked certificate, (b) improper verification of a certificate, (c) use of a certificate other than as permitted by any applicable Issuer Statement, this Agreement or applicable law; (d) failure to exercise reasonable judgment under the circumstances in relying on the CD Services or (e) failure to perform any of the obligations as required in an applicable Issuer Statement. + +2.7.5 Limit of Liability. UNDER NO CIRCUMSTANCES WILL ADOBE OR ANY CD SERVICE PROVIDER (EXCEPT AS EXPRESSLY SET FORTH IN ITS ISSUER STATEMENT) BE LIABLE TO YOU, OR ANY OTHER PERSON OR ENTITY, FOR ANY LOSS OF USE, REVENUE OR PROFIT, LOST OR DAMAGED DATA, OR OTHER COMMERCIAL OR ECONOMIC LOSS OR FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, STATUTORY, PUNITIVE, EXEMPLARY OR CONSEQUENTIAL DAMAGES WHATSOEVER RELATED TO YOUR USE OR RELIANCE UPON CD SERVICES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR IF SUCH DAMAGES ARE FORESEEABLE. THIS LIMITATION SHALL APPLY EVEN IN THE EVENT OF A FUNDAMENTAL OR MATERIAL BREACH OR A BREACH OF THE FUNDAMENTAL OR MATERIALTERMS OF THIS AGREEMENT. + +2.7.6 Third Party Beneficiaries. You agree that any CD Service Provider you utilize shall be a third party beneficiary with respect to this Section 2.7 of this Agreement, and that such CD Service Provider shall have the right to enforce such provisions in its own name as if the CD Service Provider were Adobe. +3. Restrictions. + +3.1 Web Player Prohibited Devices. You may not Use any Web Player on any non-PC device or with any embedded or device version of any operating system. For the avoidance of doubt, and by example only, you may not use a Web Player on any (a) mobile devices, set top boxes (STB), handhelds, phones, web pads, tablets and Tablet PCs that are not running Windows XP Tablet PC Edition, game consoles, TVs, DVD players, media centers (excluding Windows XP Media Center Edition and its successors), electronic billboards or other digital signage, internet appliances or other internet-connected devices, PDAs, medical devices, ATMs, telematic devices, gaming machines, home automation systems, kiosks, remote control devices, or any other consumer electronics device, (b) operator-based mobile, cable, satellite, or television systems or (c) other closed system devices. + +3.2 Notices. You shall not copy the Software except as set forth in Section 2. Any copy of the Software that you make must contain the same copyright and other proprietary notices that appear on or in the Software. + +3.3 Document Features. The Software may contain features and functionality (the "Document Features") that appear disabled or "grayed out." These Document Features will only activate when opening a PDF document that was created using corresponding enabling technology available only from Adobe ("Keys"). You agree not to access, or attempt to access, disabled Document Features or otherwise circumvent the permissions that control activation of such Document Features. You may only use the Document Features with PDF documents that have been enabled using Keys obtained under a valid license from Adobe. No other use is permitted. + +3.4 Adobe Reader Restrictions. You are not authorized to integrate or use the Adobe Reader with any other software, plug-in or enhancement that uses or relies upon the the Adobe Reader when converting or transforming PDF files into other file formats (e.g., a PDF file into a TIFF, JPEG, or SVG file). You are not authorized to integrate or use the Adobe Reader with any plug-in software not developed in accordance with the Adobe Integration Key License Agreement. Further, you are not permitted to integrate or use the Adobe Reader with other software, or access PDF files that contain instructions (e.g., JavaScript), in order to (a) save data locally (on the same Computer), (b) create a file that contains data (e.g., an XML or comments file) or (c) save modifications to a PDF file, except when such saving or creation is allowed through the use of Document Feature(s) enabled by Adobe. +4. Transfer. You may not rent, lease, sublicense, assign or transfer your rights in the Software, or authorize all or any portion of the Software to be copied onto another user's Computer except as may be expressly permitted herein. You may, however, transfer all your rights to Use the Software to another person or legal entity provided that: (a) you also transfer (i) this Agreement, and (ii) the Software and all other software or hardware bundled or pre-installed with the Software, including all copies, Updates and prior versions, to such person or entity, (b) you retain no copies, including backups and copies stored on a Computer, and (c) the receiving party accepts the terms and conditions of this Agreement and any other terms and conditions upon which you legally purchased a license to the Software. Notwithstanding the foregoing, you may not transfer education, pre-release, or not for resale copies of the Software. +5. Intellectual Property Ownership, Copyright Protection. The Software and any authorized copies that you make are the intellectual property of and are owned by Adobe Systems Incorporated and its suppliers. The structure, organization and code of the Software are the valuable trade secrets and confidential information of Adobe Systems Incorporated and its suppliers. The Software is protected by law, including without limitation the copyright laws of the United States and other countries, and by international treaty provisions. Except as expressly stated herein, this Agreement does not grant you any intellectual property rights in the Software and all rights not expressly granted are reserved by Adobe and its suppliers. +6. Updates. If the Software is an Update to a previous version of the Software, you must possess a valid license to such previous version in order to Use such Update. All Updates are provided to you on a license exchange basis. You agree that by Using an Update you voluntarily terminate your right to use any previous version of the Software. As an exception, you may continue to Use previous versions of the Software on your Computer after you Use the Update but only to assist you in the transition to the Update, provided that: (a) the Update and the previous versions are installed on the same computer; (b) the previous versions or copies thereof are not transferred to another party or Computer unless all copies of the Update are also transferred to such party or Computer; and (c) you acknowledge that any obligation Adobe may have to support the previous versions of the Software may be ended upon availability of the Update. +7. NO WARRANTY. The Software is being delivered to you "AS IS" and Adobe makes no warranty as to its use or performance. Adobe provides no technical support, warranties or remedies for the Software. ADOBE AND ITS SUPPLIERS DO NOT AND CANNOT WARRANT THE PERFORMANCE OR RESULTS YOU MAY OBTAIN BY USING THE SOFTWARE. EXCEPT FOR ANY WARRANTY, CONDITION, REPRESENTATION OR TERM TO THE EXTENT TO WHICH THE SAME CANNOT OR MAY NOT BE EXCLUDED OR LIMITED BY LAW APPLICABLE TO YOU IN YOUR JURISDICTION, ADOBE AND ITS SUPPLIERS MAKE NO WARRANTIES CONDITIONS, REPRESENTATIONS, OR TERMS (EXPRESS OR IMPLIED WHETHER BY STATUTE, COMMON LAW, CUSTOM, USAGE OR OTHERWISE) AS TO ANY MATTER INCLUDING WITHOUT LIMITATION NONINFRINGEMENT OF THIRD PARTY RIGHTS, MERCHANTABILITY, INTEGRATION, SATISFACTORY QUALITY, OR FITNESS FOR ANY PARTICULAR PURPOSE. The provisions of Section 7 and Section 8 shall survive the termination of this Agreement, howsoever caused, but this shall not imply or create any c ontinued right to Use the Software after termination of this Agreement. +8. LIMITATION OF LIABILITY. IN NO EVENT WILL ADOBE OR ITS SUPPLIERS BE LIABLE TO YOU FOR ANY DAMAGES, CLAIMS OR COSTS WHATSOEVER OR ANY CONSEQUENTIAL, INDIRECT, INCIDENTAL DAMAGES, OR ANY LOST PROFITS OR LOST SAVINGS, EVEN IF AN ADOBE REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS OR FOR ANY CLAIM BY ANY THIRD PARTY. THE FOREGOING LIMITATIONS AND EXCLUSIONS APPLY TO THE EXTENT PERMITTED BY APPLICABLE LAW IN YOUR JURISDICTION. ADOBE'S AGGREGATE LIABILITY AND THAT OF ITS SUPPLIERS UNDER OR IN CONNECTION WITH THIS AGREEMENT SHALL BE LIMITED TO THE AMOUNT PAID FOR THE SOFTWARE, IF ANY. Nothing contained in this Agreement limits Adobe's liability to you in the event of death or personal injury resulting from Adobe's negligence or for the tort of deceit (fraud). Adobe is acting on behalf of its suppliers for the purpose of disclaiming, excluding and/or limiting obligations, warranties and liability as provided in this Agreemen t, but in no other respects and for no other purpose. For further information, please see the jurisdiction specific information at the end of this Agreement, if any, or contact Adobe's Customer Support Department. +9. Export Rules. You agree that the Software will not be shipped, transferred or exported into any country or used in any manner prohibited by the United States Export Administration Act or any other export laws, restrictions or regulations (collectively the "Export Laws"). In addition, if the Software is identified as export controlled items under the Export Laws, you represent and warrant that you are not a citizen, or otherwise located within, an embargoed nation (including without limitation Iran, Syria, Sudan, Libya, Cuba, and North Korea) and that you are not otherwise prohibited under the Export Laws from receiving the Software. All rights to Use the Software are granted on condition that such rights are forfeited if you fail to comply with the terms of this Agreement. +10. Governing Law. This Agreement will be governed by and construed in accordance with the substantive laws in force: (a) in the State of California, if a license to the Software is obtained when you are in the United States, Canada, or Mexico; or (b) in Japan, if a license to the Software is obtained when you are in Japan, China, Korea, or other Southeast Asian country where all official languages are written in either an ideographic script (e.g., hanzi, kanji, or hanja), and/or other script based upon or similar in structure to an ideographic script, such as hangul or kana; or (c) England, if a license to the Software is purchased when you are in any other jurisdiction not described above. The respective courts of Santa Clara County, California when California law applies, Tokyo District Court in Japan, when Japanese law applies, and the competent courts of England, when the law of England applies, shall each have non-exclusive jurisdiction over all disputes relating to th is Agreement. This Agreement will not be governed by the conflict of law rules of any jurisdiction or the United Nations Convention on Contracts for the International Sale of Goods, the application of which is expressly excluded. +11. General Provisions. If any part of this Agreement is found void and unenforceable, it will not affect the validity of the balance of this Agreement, which shall remain valid and enforceable according to its terms. This Agreement shall not prejudice the statutory rights of any party dealing as a consumer. This Agreement may only be modified by a writing signed by an authorized officer of Adobe. Updates may be licensed to you by Adobe with additional or different terms. This is the entire agreement between Adobe and you relating to the Software and it supersedes any prior representations, discussions, undertakings, communications or advertising relating to the Software. +12. Notice to U.S. Government End Users. The Software and Documentation are "Commercial Items," as that term is defined at 48 C.F.R. Â§2.101, consisting of "Commercial Computer Software" and "Commercial Computer Software Documentation," as such terms are used in 48 C.F.R. Â§12.212 or 48 C.F.R. Â§227.7202, as applicable. Consistent with 48 C.F.R. Â§12.212 or 48 C.F.R. Â§Â§227.7202-1 through 227.7202-4, as applicable, the Commercial Computer Software and Commercial Computer Software Documentation are being licensed to U.S. Government end users (a) only as Commercial Items and (b) with only those rights as are granted to all other end users pursuant to the terms and conditions herein. Unpublished-rights reserved under the copyright laws of the United States. Adobe Systems Incorporated, 345 Park Avenue, San Jose, CA 95110-2704, USA. For U.S. Government End Users, Adobe agrees to comply with all applicable equal opportunity laws including , if appropriate, the provisions of Executive Order 11246, as amended, Section 402 of the Vietnam Era Veterans Readjustment Assistance Act of 1974 (38 USC 4212), and Section 503 of the Rehabilitation Act of 1973, as amended, and the regulations at 41 CFR Parts 60-1 through 60-60, 60-250, and 60-741. The affirmative action clause and regulations contained in the preceding sentence shall be incorporated by reference in this Agreement. +13. Compliance with Licenses. If you are a business or organization, you agree that upon request from Adobe or Adobe's authorized representative, you will within thirty (30) days fully document and certify that use of any and all Software at the time of the request is in conformity with your valid licenses from Adobe. +14. Specific Provisions and Exceptions. + +14.1 Limited Warranty for Users Residing in Germany or Austria. If you obtained the Software in Germany or Austria, and you usually reside in such country, then Section 7 does not apply, instead, Adobe warrants that the Software provides the functionalities set forth in the Documentation (the "agreed upon functionalities") for the limited warranty period following receipt of the Software when used on the recommended hardware configuration. As used in this Section, "limited warranty period" means one (1) year if you are a business user and two (2) years if you are not a business user. Non-substantial variation from the agreed upon functionalities shall not be considered and does not establish any warranty rights. THIS LIMITED WARRANTY DOES NOT APPLY TO SOFTWARE PROVIDED TO YOU FREE OF CHARGE, FOR EXAMPLE, UPDATES, PRE-RELEASE, TRYOUT, PRODUCT SAMPLER, NOT FOR RESALE (NFR) COPIES OF SOFTWARE, OR SOFTWARE THAT HAS BEEN ALTERED BY YOU, TO THE EXTENT SUCH ALT ERATIONS CAUSED A DEFECT. To make a warranty claim, during the limited warranty period you must return, at our expense, the Software and proof of purchase to the location where you obtained it. If the functionalities of the Software vary substantially from the agreed upon functionalities, Adobe is entitled -- by way of re-performance and at its own discretion -- to repair or replace the Software. If this fails, you are entitled to a reduction of the purchase price (reduction) or to cancel the purchase agreement (rescission). For further warranty information, please contact Adobe's Customer Support Department + +14.2 Limitation of Liability for Users Residing in Germany and Austria. + +14.2.1 If you obtained the Software in Germany or Austria, and you usually reside in such country, then Section 8 does not apply, Instead, subject to the provisions in Section 14.2.2, Adobe's statutory liability for damages shall be limited as follows: (i) Adobe shall be liable only up to the amount of damages as typically foreseeable at the time of entering into the purchase agreement in respect of damages caused by a slightly negligent breach of a material contractual obligation and (ii) Adobe shall not be liable for damages caused by a slightly negligent breach of a non-material contractual obligation. + +14.2.2 The aforesaid limitation of liability shall not apply to any mandatory statutory liability, in particular, to liability under the German Product Liability Act, liability for assuming a specific guarantee or liability for culpably caused personal injuries. + +14.2.3 You are required to take all reasonable measures to avoid and reduce damages, in particular to make back-up copies of the Software and your computer data subject to the provisions of this Agreement. + +14.3 Pre-release Product Additional Terms. If the product you have received with this license is pre-commercial release or beta Software ("Pre-release Software"), then the following Section applies. To the extent that any provision in this Section is in conflict with any other term or condition in this Agreement, this Section shall supercede such other term(s) and condition(s) with respect to the Pre-release Software, but only to the extent necessary to resolve the conflict. You acknowledge that the Software is a pre-release version, does not represent final product from Adobe, and may contain bugs, errors and other problems that could cause system or other failures and data loss. Consequently, the Pre-release Software is provided to you "AS-IS", and Adobe disclaims any warranty or liability obligations to you of any kind. WHERE LIABILITY CANNOT BE EXCLUDED FOR PRE-RELEASE SOFTWARE, BUT IT MAY BE LIMITED, ADOBE'S LIABILITY AND THAT OF ITS SUPPLIERS S HALL BE LIMITED TO THE SUM OF FIFTY DOLLARS (U.S. $50) IN TOTAL. You acknowledge that Adobe has not promised or guaranteed to you that Pre-release Software will be announced or made available to anyone in the future, Adobe has no express or implied obligation to you to announce or introduce the Pre-release Software and that Adobe may not introduce a product similar to or compatible with the Pre-release Software. Accordingly, you acknowledge that any research or development that you perform regarding the Pre-release Software or any product associated with the Pre-release Software is done entirely at your own risk. During the term of this Agreement, if requested by Adobe, you will provide feedback to Adobe regarding testing and use of the Pre-release Software, including error or bug reports. If you have been provided the Pre-release Software pursuant to a separate written agreement, such as the Adobe Systems Incorporated Serial Agreement for Unreleased Products, your use of th e Software is also governed by such agreement. You agree that you may not and certify that you will not sublicense, lease, loan, rent, assign or transfer the Pre-release Software. Upon receipt of a later unreleased version of the Pre-release Software or release by Adobe of a publicly released commercial version of the Software, whether as a stand-alone product or as part of a larger product, you agree to return or destroy all earlier Pre-release Software received from Adobe and to abide by the terms of the license agreement for any such later versions of the Pre-release Software. Notwithstanding anything in this Section to the contrary, if you are located outside the United States of America, you agree that you will return or destroy all unreleased versions of the Pre-release Software within thirty (30) days of the completion of your testing of the Software when such date is earlier than the date for Adobe's first commercial shipment of the publicly released (commercial) Software. + +14.4 Settings Manager. Use of the Web Players, specifically the Flash Player, will enable the Software to store certain user settings as a local shared object on a your Computer. These settings are not associated with you, but allow you to configure certain settings within the Flash Player. You can find more information on local shared objects at http://www.adobe.com/software/flashplayer/security/ and more information on the Settings Manager at www.adobe.com/go/settingsmanager. + +If you have any questions regarding this Agreement or if you wish to request any information from Adobe please use the address and contact information included with this product or via the web at www.adobe.com to contact the Adobe office serving your jurisdiction + +Adobe, Authorware, Flash, Reader, and Shockwave are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries.</tt></pre> -- 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] r62565 - in /branches/SuSE-Code-11-SP2-Branch/yast2: library/packages/src/PackagesUI.ycp package/yast2.changes
by lslezak＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: lslezak Date: Thu Oct 7 13:10:16 2010 New Revision: 62565 URL: http://svn.opensuse.org/viewcvs/yast?rev=62565&view=rev Log: - removed textdomain change (not needed, breaks translations) (bnc#445716) Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/packages/src/PackagesUI.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/packages/src/PackagesUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/packages/src/PackagesUI.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/packages/src/PackagesUI.ycp Thu Oct 7 13:10:16 2010 @@ -111,9 +111,6 @@ { ui = nil; - // TODO FIXME: due to the textfreeze "base" cannot be used now, fix it after the GM is out! - textdomain "packager"; - // help text string help = _("<big>License Confirmation</big> The package in the headline of the dialog requires an explicit confirmation @@ -123,9 +120,6 @@ To accept the license of the package, click I Agree. To reject the license of the package, click I Disagree."); - // TODO FIXME: remove this - textdomain "base"; - UI::OpenDialog (`HBox ( `VSpacing (18), `VBox ( Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Thu Oct 7 13:10:16 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 7 11:08:42 UTC 2010 - lslezak(a)suse.cz + +- removed textdomain change (not needed, breaks translations) + (bnc#445716) + +------------------------------------------------------------------- Mon Mar 29 15:12:35 CEST 2010 - ug(a)suse.de - fixed a bug with *.desktop file translations -- 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] r62564 - /branches/SuSE-Code-11-SP2-Branch/yast2/
by lslezak＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: lslezak Date: Thu Oct 7 13:05:44 2010 New Revision: 62564 URL: http://svn.opensuse.org/viewcvs/yast?rev=62564&view=rev Log: added yast2 to SP2 branch Added: branches/SuSE-Code-11-SP2-Branch/yast2/ (props changed) - copied from r62563, branches/SuSE-Code-11-SP1-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] r62563 - /branches/tmp/jsrain/unattended-migration/update/src/modules/RootPart.ycp
by jsrain＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: jsrain Date: Thu Oct 7 10:58:27 2010 New Revision: 62563 URL: http://svn.opensuse.org/viewcvs/yast?rev=62563&view=rev Log: better handling of warning in autoupgrade Modified: branches/tmp/jsrain/unattended-migration/update/src/modules/RootPart.ycp Modified: branches/tmp/jsrain/unattended-migration/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/update/src/modules/RootPart.ycp (original) +++ branches/tmp/jsrain/unattended-migration/update/src/modules/RootPart.ycp Thu Oct 7 10:58:27 2010 @@ -29,6 +29,7 @@ import "Report"; import "Label"; import "Stage"; + import "Wizard"; include "partitioning/custom_part_dialogs.ycp"; @@ -1398,10 +1399,15 @@ if (FstabUsesKernelDeviceNameForHarddisks(fstab)) { y2warning("fstab on %1 uses kernel device name for hard disks", root_device_current); - Popup::Warning(sformat(_("Some partitions in the system on %1 are mounted by kernel-device name. This is + string warning = sformat (_("Some partitions in the system on %1 are mounted by kernel-device name. This is not reliable for the update since kernel-device names are unfortunately not persistent. It is strongly recommended to start the old system and change the -mount-by method to any other method for all partitions."), root_device_current)); +mount-by method to any other method for all partitions."), root_device_current); + if (Mode::autoupgrade()) { + Popup::TimedWarning(warning, 10); + } else { + Popup::Warning(warning); + } } if (size (fstab) == 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] r62562 - /tags/stable-2_20_0/yast2/
by lslezak＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: lslezak Date: Thu Oct 7 09:31:43 2010 New Revision: 62562 URL: http://svn.opensuse.org/viewcvs/yast?rev=62562&view=rev Log: Created tag stable-2_20_0 for yast2 Added: tags/stable-2_20_0/yast2/ (props changed) - copied from r62561, 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] r62561 - in /trunk/yast2: VERSION library/packages/src/PackageCallbacks.ycp package/yast2.changes
by lslezak＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: lslezak Date: Thu Oct 7 09:28:23 2010 New Revision: 62561 URL: http://svn.opensuse.org/viewcvs/yast?rev=62561&view=rev Log: - just log problemDeltaDownload callbacks - libzypp automatically tries full rpm if patch/delta cannot be downloaded, displaying error popup breaks unattended installation (bnc#377569) - 2.20.0 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=62561&r1=62560… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Oct 7 09:28:23 2010 @@ -1 +1 @@ -2.19.13 +2.20.0 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 Thu Oct 7 09:28:23 2010 @@ -1683,17 +1683,17 @@ global void ProblemDeltaDownload (string descr) { FinishPatchDeltaProvide (); // close popup - Report::ShowText (_("Failed to download delta RPM"), descr); + y2milestone("Failed to download delta RPM: %1", descr); } global void ProblemDeltaApply (string descr) { FinishPatchDeltaProvide (); // close popup - Report::ShowText (_("Failed to apply delta RPM"), descr); + y2milestone("Failed to apply delta RPM: %1", descr); } global void ProblemPatchDownload (string descr) { FinishPatchDeltaProvide (); // close popup - Report::ShowText (_("Failed to download patch RPM"), descr); + y2milestone("Failed to download patch RPM: %1", descr); } 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 Thu Oct 7 09:28:23 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Oct 7 07:21:57 UTC 2010 - lslezak(a)suse.cz + +- just log problemDeltaDownload callbacks - libzypp automatically + tries full rpm if patch/delta cannot be downloaded, displaying + error popup breaks unattended installation (bnc#377569) +- 2.20.0 + +------------------------------------------------------------------- Mon Jul 19 14:56:51 CEST 2010 - mzugec(a)suse.cz - yast2 bash completion - show all yast modules (bnc#621848) -- 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] r62560 - in /trunk/samba-server: ./ src/ src/config/ testsuite/Modules/ testsuite/YaPI/ users-plugin/
by lslezak＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: lslezak Date: Thu Oct 7 09:08:58 2010 New Revision: 62560 URL: http://svn.opensuse.org/viewcvs/yast?rev=62560&view=rev Log: updated SVN ignored files Modified: trunk/samba-server/ (props changed) trunk/samba-server/src/ (props changed) trunk/samba-server/src/config/ (props changed) trunk/samba-server/testsuite/Modules/ (props changed) trunk/samba-server/testsuite/YaPI/ (props changed) trunk/samba-server/users-plugin/ (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] r62559 - /tags/stable-2_20_0/tune/
by lslezak＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: lslezak Date: Thu Oct 7 09:06:29 2010 New Revision: 62559 URL: http://svn.opensuse.org/viewcvs/yast?rev=62559&view=rev Log: Created tag stable-2_20_0 for tune Added: tags/stable-2_20_0/tune/ - copied from r62558, trunk/tune/ -- 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] r62558 - in /trunk/tune: VERSION hwinfo/src/hwinfo.ycp package/yast2-tune.changes
by lslezak＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: lslezak Date: Thu Oct 7 09:06:22 2010 New Revision: 62558 URL: http://svn.opensuse.org/viewcvs/yast?rev=62558&view=rev Log: - use Icon.ycp module for displaying icon - 2.20.0 Modified: trunk/tune/VERSION trunk/tune/hwinfo/src/hwinfo.ycp trunk/tune/package/yast2-tune.changes Modified: trunk/tune/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/VERSION?rev=62558&r1=62557&… ============================================================================== --- trunk/tune/VERSION (original) +++ trunk/tune/VERSION Thu Oct 7 09:06:22 2010 @@ -1 +1 @@ -2.18.1 +2.20.0 Modified: trunk/tune/hwinfo/src/hwinfo.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/hwinfo.ycp?rev=6… ============================================================================== --- trunk/tune/hwinfo/src/hwinfo.ycp (original) +++ trunk/tune/hwinfo/src/hwinfo.ycp Thu Oct 7 09:06:22 2010 @@ -17,6 +17,7 @@ import "Arch"; import "Directory"; import "CommandLine"; +import "Icon"; //include "hwinfo/classnames.ycp"; include "hwinfo/routines.ycp"; @@ -26,21 +27,6 @@ */ boolean abortPressed = false; -term Icon (string icon_name) { - map ui_info = UI::GetDisplayInfo(); - if ((boolean) ui_info["HasLocalImageSupport"]:false == false) return `Empty(); - - return `Image ( - sformat ( - "%1/current/icons/22x22/apps/%2.png", - Directory::themedir, - icon_name - ), - "[x]" - ); -} - - /* * open progress bar window */ @@ -52,7 +38,7 @@ `VBox( `HSpacing(40), `HBox( - `HSquash (`MarginBox (0.5, 0.2, Icon("yast-hwinfo"))), + `HSquash (`MarginBox (0.5, 0.2, Icon::Image("yast-hwinfo", $[]))), // translators: popup heading `Left (`Heading(`id(`heading), _("Probing Hardware..."))) ), Modified: trunk/tune/package/yast2-tune.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/package/yast2-tune.changes?… ============================================================================== --- trunk/tune/package/yast2-tune.changes (original) +++ trunk/tune/package/yast2-tune.changes Thu Oct 7 09:06:22 2010 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 7 07:01:30 UTC 2010 - lslezak(a)suse.cz + +- use Icon.ycp module for displaying icon +- 2.20.0 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(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] r62557 - in /branches/tmp/jsrain/unattended-migration/installation/control: control.SLED.xml control.SLES.xml
by jsrain＠svn2.opensuse.org 07 Oct '10

07 Oct '10

Author: jsrain Date: Thu Oct 7 09:04:35 2010 New Revision: 62557 URL: http://svn.opensuse.org/viewcvs/yast?rev=62557&view=rev Log: updated workflow Modified: branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml Modified: branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml (original) +++ branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml Thu Oct 7 09:04:35 2010 @@ -467,7 +467,7 @@ <proposal> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <enable_skip>no</enable_skip> @@ -746,6 +746,7 @@ </modules> </workflow> +  <workflow> <defaults> <archs>all</archs> @@ -754,111 +755,26 @@ <mode>update</mode> <stage>initial</stage> <modules config:type="list"> - <module> - <name>complex_welcome</name> - <label>Welcome</label> - <enable_back>no</enable_back> - <enable_next>yes</enable_next> - <arguments> - <first_run>yes</first_run> - </arguments> - <retranslate config:type="boolean">true</retranslate> - </module> - <module> - <label>Welcome</label> - <name>checkmedia</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Disk Activation</label> - <name>disks_activate</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System Analysis</label> - <name>system_analysis</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System Analysis</label> - <name>mode</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System for Update</label> - <name>update_partition</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> </module> <module> - <name>upgrade_urls</name> - <enable_back>yes</enable_back> - </module> - <module> - <label>Add-On Products</label> - <name>add-on</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> <heading>yes</heading> <label>Update</label> </module> <module> - <label>Update Summary</label> - <name>lilo_convert</name> - <execute>inst_lilo_convert</execute> - </module> - <module> - <label>Update Summary</label> - <name>inital_update_proposal</name> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> <execute>inst_proposal</execute> <proposal>initial</proposal> - </module> -  - <module> - <label>Perform Update</label> - <name>bl_preupdate</name> - <execute>bootloader_preupdate</execute> - </module> -  - <module> - <label>Perform Update</label> - <name>prepareprogress</name> - </module> - - <module> - <label>Perform Update</label> - <name>do_resize</name> - <update config:type="boolean">false</update> - <archs>i386,x86_64,ia64</archs> - </module> - <module> - <label>Perform Update</label> - <name>prepdisk</name> - </module> - <module> - <label>Perform Update</label> - <name>kickoff</name> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> </module> <module> <label>Perform Update</label> <name>rpmcopy</name> </module> - <module> - <label>Perform Update</label> - <name>finish</name> - </module> </modules> </workflow> @@ -1281,6 +1197,142 @@ <workflow> <defaults> <archs>all</archs> + </defaults> + <label>Preparation</label> + <mode>autoupgrade</mode> + <stage>initial</stage> + <modules config:type="list"> + + <module> + <label>System Analysis</label> + <name>system_analysis</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>System for Update</label> + <name>update_partition_auto</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autoinit</name> + <archs>all</archs> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> + </module> + + + <module> + <heading>yes</heading> + <label>Update</label> + </module> + + + <module> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> + <execute>inst_proposal</execute> + <proposal>initial</proposal> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> + +  + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> +  + <module> + <label>Perform Update</label> + <name>prepareprogress</name> + </module> + + <module> + <label>Perform Update</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Update</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Update</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Update</label> + <name>store_upgrade_software</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy</name> + </module> + <module> +  + <label>Perform Update</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> + <module> + <label>Perform Update</label> + <name>finish</name> + </module> + </modules> + </workflow> + + <workflow> + <defaults> + <archs>all</archs> <enable_back>no</enable_back> <enable_next>no</enable_next> </defaults> @@ -1312,6 +1364,72 @@ </module> </modules> </workflow> + +  + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>autoupgrade</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + +  + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>update</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> </workflows> </productDefines> Modified: branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml (original) +++ branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml Thu Oct 7 09:04:35 2010 @@ -886,6 +886,7 @@ </modules> </workflow> +  <workflow> <defaults> <archs>all</archs> @@ -894,117 +895,26 @@ <mode>update</mode> <stage>initial</stage> <modules config:type="list"> - <module> - <name>complex_welcome</name> - <label>Welcome</label> - <enable_back>no</enable_back> - <enable_next>yes</enable_next> - <arguments> - <first_run>yes</first_run> - </arguments> - <retranslate config:type="boolean">true</retranslate> - </module> - <module> - <label>Welcome</label> - <name>checkmedia</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Disk Activation</label> - <name>disks_activate</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System Analysis</label> - <name>system_analysis</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System Analysis</label> - <name>mode</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>System for Update</label> - <name>update_partition</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> </module> <module> - <name>upgrade_urls</name> - <enable_back>yes</enable_back> - </module> - <module> - <label>Add-On Products</label> - <name>add-on</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> <heading>yes</heading> <label>Update</label> </module> <module> - <label>Update Summary</label> - <name>lilo_convert</name> - <execute>inst_lilo_convert</execute> - </module> - <module> - <label>Update Summary</label> + <label>AutoYaST Settings</label> <name>initial_update_proposal</name> <execute>inst_proposal</execute> <proposal>initial</proposal> - </module> -  - <module> - <label>Perform Update</label> - <name>bl_preupdate</name> - <execute>bootloader_preupdate</execute> - </module> -  - <module> - <label>Perform Update</label> - <name>prepareprogress</name> - </module> - - <module> - <label>Perform Update</label> - <name>do_resize</name> - <update config:type="boolean">false</update> - <archs>i386,x86_64,ia64</archs> - </module> - <module> - <label>Perform Update</label> - <name>prepdisk</name> - </module> - <module> - <label>Perform Update</label> - <name>kickoff</name> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> </module> <module> <label>Perform Update</label> <name>rpmcopy</name> </module> - <module> -  - <label>Perform Update</label> - <name>reiplauto</name> - <archs>s390</archs> - </module> - <module> - <label>Perform Update</label> - <name>finish</name> - </module> </modules> </workflow> @@ -1123,103 +1033,6 @@ <workflow> <stage>continue</stage> - <mode>update</mode> - <defaults> - <archs>all</archs> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </defaults> - <modules config:type="list"> - <module> - <label>Perform Update</label> - <name>rpmcopy_secondstage</name> - </module> - <module> - <heading>yes</heading> - <label>Configuration</label> - </module> - <module> - <label>Network</label> - <name>ask_net_test</name> -  - <enable_back>no</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Network</label> - <name>do_net_test</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Customer Center</label> - <name>addon_update_sources</name> - </module> - <module> - <label>Customer Center</label> - <name>suse_register</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Online Update</label> - <name>ask_online_update</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Online Update</label> - <name>you</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - <module> - <label>Online Update</label> - <name>restore_settings</name> - </module> - <module> - <label>Clean Up</label> - <name>suseconfig</name> - </module> - <module> - <label>Release Notes</label> - <name>release_notes</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - -  - <module> -  - <name>congratulate_all_archs</name> - <execute>inst_congratulate</execute> - <archs>i386,x86_64,ia64,ppc,ppc64</archs> - <arguments> - <show_zmd_turnoff_checkbox>yes</show_zmd_turnoff_checkbox> - <zmd_turnoff_default_state>no</zmd_turnoff_default_state> - </arguments> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> -  - <module> -  - <name>congratulate_s390_archs</name> - <execute>inst_congratulate</execute> - <archs>s390,s390x</archs> - <arguments> - <show_zmd_turnoff_checkbox>yes</show_zmd_turnoff_checkbox> - <zmd_turnoff_default_state>yes</zmd_turnoff_default_state> - </arguments> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> - - </modules> - </workflow> - - <workflow> - <stage>continue</stage> <mode>installation</mode> <defaults> <enable_back>yes</enable_back> @@ -1595,7 +1408,6 @@ </modules> </workflow> - <workflow> <defaults> <archs>all</archs> @@ -1632,5 +1444,72 @@ </modules> </workflow> +  + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>autoupgrade</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + +  + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>update</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + + </workflows> </productDefines> -- 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] r62556 - /tags/branch-SLE-10-SP4-2_13_20/instserver/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 21:52:32 2010 New Revision: 62556 URL: http://svn.opensuse.org/viewcvs/yast?rev=62556&view=rev Log: Created tag branch-SLE-10-SP4-2_13_20 for instserver Added: tags/branch-SLE-10-SP4-2_13_20/instserver/ - copied from r62555, branches/SuSE-SLE-10-SP4-Branch/instserver/ -- 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] r62555 - /tags/branch-SLE-10-SP4-2_13_20/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 21:52:28 2010 New Revision: 62555 URL: http://svn.opensuse.org/viewcvs/yast?rev=62555&view=rev Log: Created tag branch-SLE-10-SP4-2_13_20 Added: tags/branch-SLE-10-SP4-2_13_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] r62554 - in /branches/SuSE-SLE-10-SP4-Branch/instserver: VERSION package/yast2-instserver.changes src/Instserver.ycp
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 21:24:11 2010 New Revision: 62554 URL: http://svn.opensuse.org/viewcvs/yast?rev=62554&view=rev Log: - fixed creating SLP reg. files: fixed writing architectures, fixed reescaping already escaped values (bnc#492367) - 2.13.20 Modified: branches/SuSE-SLE-10-SP4-Branch/instserver/VERSION branches/SuSE-SLE-10-SP4-Branch/instserver/package/yast2-instserver.changes branches/SuSE-SLE-10-SP4-Branch/instserver/src/Instserver.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/instserver/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/instse… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/instserver/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/instserver/VERSION Wed Oct 6 21:24:11 2010 @@ -1 +1 @@ -2.13.19 +2.13.20 Modified: branches/SuSE-SLE-10-SP4-Branch/instserver/package/yast2-instserver.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/instse… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/instserver/package/yast2-instserver.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/instserver/package/yast2-instserver.changes Wed Oct 6 21:24:11 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 6 19:16:34 UTC 2010 - lslezak(a)suse.cz + +- fixed creating SLP reg. files: fixed writing architectures, + fixed reescaping already escaped values (bnc#492367) +- 2.13.20 + +------------------------------------------------------------------- Wed Jul 8 16:21:36 CEST 2009 - lslezak(a)suse.cz - check the network service status at startup (bnc#308662) Modified: branches/SuSE-SLE-10-SP4-Branch/instserver/src/Instserver.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/instse… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/instserver/src/Instserver.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/instserver/src/Instserver.ycp Wed Oct 6 21:24:11 2010 @@ -523,6 +523,76 @@ return ret; } +string subreplace(string text, string in, string out) +{ + list<string> parts = splitstring(text, "\\"); + + // don't modify the first item, it's the non-matched prefix + boolean first = true; + list<string> new_parts = maplist(string p, parts, + { + if (first) + { + first = false; + return p; + } + + string new_part = p; + + if (in == substring(p, 0, 2)) + { + new_part = out + substring(p, 2); + } + else + { + // put the backslash back if the remaining part doesn't match + new_part = "\\" + p; + } + + return new_part; + } + ); + + string ret = mergestring(new_parts, ""); + y2debug("unescaped str: text: %1, in: %2, out: %3 => %4", text, in, out, ret); + + return ret; +} + +// this is an oppsite function to EscapeSLPData() +// it takes SLP input and unescpaes the backslash sequences +map<string, string> UnEscapeSLPData(map<string, string> a) +{ + map<string, string> ret = $[]; + + foreach(string key, string value, a, + { + // String::Replace() enters endless loop in '\' -> '\5c' conversion + // use splitstring() and mergestring() builtins instead + string new_key = key; + new_key = subreplace(new_key, "2e", "."); + new_key = subreplace(new_key, "3d", "="); + new_key = subreplace(new_key, "23", "#"); + new_key = subreplace(new_key, "3b", ";"); + new_key = subreplace(new_key, "5c", "\\"); + + string new_value = value; + new_value = subreplace(new_value, "28", "("); + new_value = subreplace(new_value, "29", ")"); + new_value = subreplace(new_value, "2c", ","); + new_value = subreplace(new_value, "23", "#"); + new_value = subreplace(new_value, "3b", ";"); + new_value = subreplace(new_value, "5c", "\\"); + + ret[new_key] = new_value; + } + ); + + y2milestone("Unescaped SLP attributes: %1 -> %2", a, ret); + + return ret; +} + /* * Return the IP address of the local machine * @return string IP Address @@ -555,6 +625,48 @@ return hostname; } +list<string> basearch_mapping(string basearch) +{ + map<string,list<string> > mapping = $[ + "i586" : [ "i586", "i686" ], + "mips" : [ "mips", "mips64" ], + "ppc" : [ "ppc", "ppc64" ], + "sparc" : [ "sparc", "sparc64"], + "x86_64" : [ "x86_64"] + ]; + + if (!haskey(mapping, basearch)) + { + y2warning("Unknown BASEARCH: %1", basearch); + } + + // return the original basearch if mapping is unknown + list<string> ret = mapping[basearch]:[basearch]; + + y2milestone("Using BASEARCH mapping: %1 -> %2", basearch, ret); + + return ret; +} + +list<string> get_machines(string basearch_value) +{ + list<string> archs = splitstring(basearch_value, " "); + archs = filter(string a, archs, {return a != nil && a != "";}); + + list<string> ret = []; + + foreach(string a, archs, + { + ret = (list<string>)merge(ret, basearch_mapping(a)); + } + ); + + y2milestone("Final BASEARCH mapping: %1", ret); + + return ret; +} + + /** * Write SLP configuration */ @@ -630,21 +742,38 @@ string machine = ""; list<string> machines = []; foreach(string k, any v, cm, ``{ - if (issubstring(k, "ARCH")) + y2debug("Read Key: '%1'", k); + + if (k == "BASEARCHS") + { + // machine mapping + machines = get_machines((string)v); + } + else if (issubstring(k, "ARCH")) { - machines = (list<string>)union (machines, splitstring((string)v, " ") ); + string a = regexpsub(k, "ARCH\\.(.*)", "\\1"); + + if (a != nil) + { + y2milestone("Found %1 key, adding arch %2 to the list", k, a); + machines = add(machines, a); + } } }); machines = filter(string m , machines, ``(m!="" && m!="noarch")); machines = toset(machines); + + // sort the list so it looks better + machines = sort(machines); + string machines_string = mergestring(machines, ","); + y2debug("machines: %1", machines); - attr["machine"] = mergestring(machines, ","); - y2debug("machine: %1", machine); // preserve the old configuration if (SCR::Read(.target.size, read_file) >= 0) { y2milestone("Existing reg.d file found: %1", read_file); + map<string, string> old_attr = $[]; string reg_cont = (string)SCR::Read(.target.string, read_file); list<string> lines = splitstring(reg_cont, "\n"); @@ -656,11 +785,24 @@ if (parsed_name != nil) { y2milestone("Reusing attribute: %1=%2", parsed_name, parsed_value); - attr[parsed_name] = parsed_value; + old_attr[parsed_name] = parsed_value; } } ); + // unescape the read value + old_attr = UnEscapeSLPData(old_attr); + + if (haskey(old_attr, "machine")) + { + // backup the "machine" value + machines_string = old_attr["machine"]:""; + } + + // merge them with read values, + // keep the original setting if a value was already set + attr = (map<string, string>)union(attr, old_attr); + /* TODO: checking? // don't check the overwritten config file @@ -678,6 +820,11 @@ // escape invalid characters attr = EscapeSLPData(attr); + // replace the machine option after escaping, + // it actually _is_ a list so "," is valid here + attr["machine"] = machines_string; + y2milestone("machine: %1", attr["machine"]:""); + y2milestone("registering SLP service: serv: %1, attr: %2, regfile: %3", serv, attr, regfile); boolean ret = SLP::RegFile(serv, attr, regfile ); -- 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] r62553 - /tags/branch-SLE-10-SP4-2_13_117/yast2/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 20:09:06 2010 New Revision: 62553 URL: http://svn.opensuse.org/viewcvs/yast?rev=62553&view=rev Log: Created tag branch-SLE-10-SP4-2_13_117 for yast2 Added: tags/branch-SLE-10-SP4-2_13_117/yast2/ (props changed) - copied from r62552, 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] r62552 - /tags/branch-SLE-10-SP4-2_13_117/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 20:09:04 2010 New Revision: 62552 URL: http://svn.opensuse.org/viewcvs/yast?rev=62552&view=rev Log: Created tag branch-SLE-10-SP4-2_13_117 Added: tags/branch-SLE-10-SP4-2_13_117/ -- 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] r62551 - /tags/branch-SLE-10-SP4-2_13_186/packager/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 20:08:52 2010 New Revision: 62551 URL: http://svn.opensuse.org/viewcvs/yast?rev=62551&view=rev Log: Created tag branch-SLE-10-SP4-2_13_186 for packager Added: tags/branch-SLE-10-SP4-2_13_186/packager/ (props changed) - copied from r62550, 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] r62550 - /tags/branch-SLE-10-SP4-2_13_186/
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 20:08:50 2010 New Revision: 62550 URL: http://svn.opensuse.org/viewcvs/yast?rev=62550&view=rev Log: Created tag branch-SLE-10-SP4-2_13_186 Added: tags/branch-SLE-10-SP4-2_13_186/ -- 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] r62549 - in /branches/SuSE-SLE-10-SP4-Branch/packager: VERSION package/yast2-packager.changes src/modules/InstURL.ycp
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 20:08:16 2010 New Revision: 62549 URL: http://svn.opensuse.org/viewcvs/yast?rev=62549&view=rev Log: - put the Linuxrc CD/DVD device to the beginning of the CD/DVD device list - prefer the Linuxrc medium (bnc#588830) - 2.13.186 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/InstURL.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 Oct 6 20:08:16 2010 @@ -1 +1 @@ -2.13.185 +2.13.186 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 Oct 6 20:08:16 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +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 + device list - prefer the Linuxrc medium (bnc#588830) +- 2.13.186 + +------------------------------------------------------------------- Fri Jul 24 08:43:26 CEST 2009 - lslezak(a)suse.cz - fixed URL password logging into y2log (bnc#441944) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/InstURL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/InstURL.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/modules/InstURL.ycp Wed Oct 6 20:08:16 2010 @@ -58,6 +58,24 @@ if (size (ready) != 0) devlist = ready; + + // add the Linuxrc medium to the beginning + string cdrom = Linuxrc::InstallInf("Cdrom"); + if (cdrom != nil && cdrom != "") + { + y2milestone("Found CD/DVD device in /etc/install.inf: %1", cdrom); + string linuxrc_device = "/dev/" + cdrom; + y2milestone("Using Linuxrc device: %1", linuxrc_device); + + // remove the device if it is already in the list + devlist = filter(string d, devlist, {return d != linuxrc_device;}); + + // put the linuxrc device at the beginning + devlist = prepend(devlist, linuxrc_device); + + y2milestone("Using CD/DVD device list: %1", devlist); + } + foreach (string d, devlist, { if (d != "") { -- 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] r62548 - in /branches/SuSE-SLE-10-SP4-Branch/yast2: VERSION library/types/src/URL.ycp library/types/testsuite/tests/URL.out package/yast2.changes
by lslezak＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: lslezak Date: Wed Oct 6 19:51:10 2010 New Revision: 62548 URL: http://svn.opensuse.org/viewcvs/yast?rev=62548&view=rev Log: - allow entering some symbols in passwords when adding a new repository (bnc#598836) - 2.13.117 Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/VERSION branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/src/URL.ycp branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/testsuite/tests/URL.out 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 Wed Oct 6 19:51:10 2010 @@ -1 +1 @@ -2.13.116 +2.13.117 Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/src/URL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/src/URL.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/src/URL.ycp Wed Oct 6 19:51:10 2010 @@ -38,17 +38,38 @@ * order (the first or the last) during processing */ global map<string, string> transform_map_passwd = $[ - ";":"%3b", - "/":"%2f", - "?":"%3f", - ":":"%3a", - "@":"%40", + " ":"%20", + "!":"%21", + "\"":"%22", + "#":"%23", + "$":"%24", "&":"%26", - "=":"%3d", + "'":"%27", + "(":"%28", + ")":"%29", + "*":"%2a", "+":"%2b", - "$":"%24", ",":"%2c", - " ":"%20" + "-":"%2d", + ".":"%2e", + "/":"%2f", + ":":"%3a", + ";":"%3b", + "<":"%3c", + "=":"%3d", + ">":"%3e", + "?":"%3f", + "@":"%40", + "[":"%5b", + "\\":"%5c", + "]":"%5d", + "^":"%5e", + "_":"%5f", + "`":"%60", + "{":"%7b", + "|":"%7c", + "}":"%7d", + "~":"%7e" ]; /** @@ -289,6 +310,7 @@ if (size(userpass) != 0 && tokens["pass"]:"" != "" ) { userpass = sformat("%1:%2", userpass, EscapeString(tokens["pass"]:"", transform_map_passwd) ); + y2debug("Escaped user and password: '%1' => '%2'", tokens["pass"]:"", userpass); } if (size(userpass) > 0 ) userpass = userpass + "@"; Modified: branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/testsuite/tests/URL.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/testsuite/tests/URL.out (original) +++ branches/SuSE-SLE-10-SP4-Branch/yast2/library/types/testsuite/tests/URL.out Wed Oct 6 19:51:10 2010 @@ -5,7 +5,7 @@ Return abcd%25 Return ab%25c%24d Return %20%25%24%20 -Return _<>{} +Return %5f%3c%3e%7b%7d Return %25 Return Return 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 Wed Oct 6 19:51:10 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 6 16:51:13 UTC 2010 - lslezak(a)suse.cz + +- allow entering some symbols in passwords when adding a new + repository (bnc#598836) +- 2.13.117 + +------------------------------------------------------------------- Mon Mar 22 14:50:16 CET 2010 - mzugec(a)suse.cz - L3: autoinstallation with manual setup (bnc#568653) -- 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] r62547 - /branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/lilolike.ycp
by jreidinger＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: jreidinger Date: Wed Oct 6 16:14:43 2010 New Revision: 62547 URL: http://svn.opensuse.org/viewcvs/yast?rev=62547&view=rev Log: fix syntax error ( ruby makes me so lazy :) Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/lilolike.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/lilolike.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/lilolike.ycp Wed Oct 6 16:14:43 2010 @@ -1438,7 +1438,7 @@ // 32-bit guest has bad default timer which cause problem during typing text, so switch to better one (bnc#605842) if (Arch::i386()) { - ret = ret + " clock=pit" + ret = ret + " clock=pit"; } y2milestone("additional append args for kernel on HVM guest: %1", ret); 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] r62546 - /tags/branch-SLE-10-SP4-2_13_165/bootloader/
by jreidinger＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: jreidinger Date: Wed Oct 6 15:35:20 2010 New Revision: 62546 URL: http://svn.opensuse.org/viewcvs/yast?rev=62546&view=rev Log: Created tag branch-SLE-10-SP4-2_13_165 for bootloader Added: tags/branch-SLE-10-SP4-2_13_165/bootloader/ - copied from r62545, 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] r62545 - /tags/branch-SLE-10-SP4-2_13_165/
by jreidinger＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: jreidinger Date: Wed Oct 6 15:35:17 2010 New Revision: 62545 URL: http://svn.opensuse.org/viewcvs/yast?rev=62545&view=rev Log: Created tag branch-SLE-10-SP4-2_13_165 Added: tags/branch-SLE-10-SP4-2_13_165/ -- 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] r62544 - in /branches/SuSE-SLE-10-SP4-Branch/bootloader: VERSION package/yast2-bootloader.changes
by jreidinger＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: jreidinger Date: Wed Oct 6 15:25:28 2010 New Revision: 62544 URL: http://svn.opensuse.org/viewcvs/yast?rev=62544&view=rev Log: changes Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes 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 Wed Oct 6 15:25:28 2010 @@ -1 +1 @@ -2.13.164.1 +2.13.165 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 Wed Oct 6 15:25:28 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 6 13:24:54 UTC 2010 - jreidinger(a)novell.com + +- fix timer issue for Xen HVM domU on i386 (bnc#605842) +- 2.13.165 + +------------------------------------------------------------------- Thu May 20 15:09:23 CEST 2010 - juhliarik(a)suse.cz - L3: added fix for adding cio_ignore to zipl.conf (bnc#604808) -- 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] r62543 - /branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/lilolike.ycp
by jreidinger＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: jreidinger Date: Wed Oct 6 15:24:36 2010 New Revision: 62543 URL: http://svn.opensuse.org/viewcvs/yast?rev=62543&view=rev Log: fix timer issue for Xen HVM domU on i386 (bnc#605842) Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/lilolike.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/lilolike.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/lilolike.ycp Wed Oct 6 15:24:36 2010 @@ -1435,6 +1435,11 @@ ret = ret + tmp_arg; }); } + // 32-bit guest has bad default timer which cause problem during typing text, so switch to better one (bnc#605842) + if (Arch::i386()) + { + ret = ret + " clock=pit" + } y2milestone("additional append args for kernel on HVM guest: %1", ret); 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] r62542 - /branches/SuSE-SLE-10-SP4-Branch/
by mvidner＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: mvidner Date: Wed Oct 6 14:34:03 2010 New Revision: 62542 URL: http://svn.opensuse.org/viewcvs/yast?rev=62542&view=rev Log: Created the SLE10 SP4 development branch. See also http://en.opensuse.org/YaST/Development/SVN_branches Er, http://old-en.opensuse.org/YaST/Development/SVN_branches [COBE] Added: branches/SuSE-SLE-10-SP4-Branch/ - copied from r62541, branches/SuSE-SLE-10-SP3-Branch/ -- 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] r62541 - /trunk/bootloader/src/routines/section_widgets.ycp
by jreidinger＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: jreidinger Date: Wed Oct 6 14:03:09 2010 New Revision: 62541 URL: http://svn.opensuse.org/viewcvs/yast?rev=62541&view=rev Log: allow to not specify vga mode for boot (bnc#643984) Modified: trunk/bootloader/src/routines/section_widgets.ycp Modified: trunk/bootloader/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/section_… ============================================================================== --- trunk/bootloader/src/routines/section_widgets.ycp (original) +++ trunk/bootloader/src/routines/section_widgets.ycp Wed Oct 6 14:03:09 2010 @@ -452,6 +452,7 @@ items = prepend(items,`item(`id("extended"), _("Standard 8-pixel font mode."))); // item of a combo box items = prepend (items, `item (`id ("normal"), _("Text Mode"))); + items = prepend (items, `item (`id (""), _("Unspecified"))); UI::ChangeWidget (`id (widget), `Items, items); SectionOptionInit (widget); } -- 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] r62540 - /trunk/bootloader/src/routines/section_helps.ycp
by jreidinger＠svn2.opensuse.org 06 Oct '10

06 Oct '10

Author: jreidinger Date: Wed Oct 6 13:14:38 2010 New Revision: 62540 URL: http://svn.opensuse.org/viewcvs/yast?rev=62540&view=rev Log: improve help text for menu section (bnc#621290) Modified: trunk/bootloader/src/routines/section_helps.ycp Modified: trunk/bootloader/src/routines/section_helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/section_… ============================================================================== --- trunk/bootloader/src/routines/section_helps.ycp (original) +++ trunk/bootloader/src/routines/section_helps.ycp Wed Oct 6 13:14:38 2010 @@ -59,7 +59,7 @@ "menu_root" : _("Partition of Menu File"), "configfile" : - _("Menu Description File"), + _("Menu Description File specifies path on root device from which is loaded menu file."), "remap" : _("Map Section to the First Disk from Device Map Windows usually need to be on the first disk."), "MeasuresTableHelp" : -- 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] r62539 - /trunk/bootloader/src/modules/BootCommon.ycp
by jreidinger＠svn2.opensuse.org 05 Oct '10

05 Oct '10

Author: jreidinger Date: Tue Oct 5 15:53:08 2010 New Revision: 62539 URL: http://svn.opensuse.org/viewcvs/yast?rev=62539&view=rev Log: explicitelly mention variables to compare to avoid problems with nil value (consider nil as false) Modified: trunk/bootloader/src/modules/BootCommon.ycp Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Tue Oct 5 15:53:08 2010 @@ -845,9 +845,9 @@ if (VerifyMDArray()) { - if ((enable_md_array_redundancy == false) && (haskey(my_globals, "boot_md_mbr"))) + if ((enable_md_array_redundancy != true) && (haskey(my_globals, "boot_md_mbr"))) my_globals = remove(my_globals, "boot_md_mbr"); - if ((enable_md_array_redundancy) && (!haskey(my_globals, "boot_md_mbr"))) + if ((enable_md_array_redundancy == true ) && (!haskey(my_globals, "boot_md_mbr"))) my_globals["boot_md_mbr"] = BootStorage::addMDSettingsToGlobals(); } 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] r62538 - /trunk/bootloader/src/modules/BootStorage.ycp
by jreidinger＠svn2.opensuse.org 05 Oct '10

05 Oct '10

Author: jreidinger Date: Tue Oct 5 15:45:18 2010 New Revision: 62538 URL: http://svn.opensuse.org/viewcvs/yast?rev=62538&view=rev Log: number of partition can be integer so always convert it to string Modified: trunk/bootloader/src/modules/BootStorage.ycp Modified: trunk/bootloader/src/modules/BootStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootStora… ============================================================================== --- trunk/bootloader/src/modules/BootStorage.ycp (original) +++ trunk/bootloader/src/modules/BootStorage.ycp Tue Oct 5 15:45:18 2010 @@ -1300,7 +1300,7 @@ if (!contains(md_physical_disks, p_dev["disk"]:"")) md_physical_disks = add(md_physical_disks,p_dev["disk"]:""); - string no_p = p_dev["nr"]:""; + string no_p = tostring(p_dev["nr"]:""); if (no_p == "") { y2error("Wrong number of partition: %1 from Storage::GetDiskPartition: %2", dev, p_dev); -- 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] r62537 - /trunk/bootloader/src/clients/bootloader_proposal.ycp
by jreidinger＠svn2.opensuse.org 05 Oct '10

05 Oct '10

Author: jreidinger Date: Tue Oct 5 13:44:28 2010 New Revision: 62537 URL: http://svn.opensuse.org/viewcvs/yast?rev=62537&view=rev Log: more explanation for warning messages with hint how to solve it Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_proposal.ycp (original) +++ trunk/bootloader/src/clients/bootloader_proposal.ycp Tue Oct 5 13:44:28 2010 @@ -119,7 +119,7 @@ ret = add (ret, "warning_level", `warning); // warning text in the summary richtext ret = add (ret, "warning", - sformat(_("The bootloader is installed on a partition that does not lie entirely below %1 GB. The system might not boot."), max_end)); + sformat(_("The bootloader is installed on a partition that does not lie entirely below %1 GB. The system might not boot if BIOS support only lba24 (result is error 18 during install grub MBR)."), max_end)); } } @@ -135,7 +135,7 @@ ret["warning"]:"" + _("Configure a valid boot loader location before continuing. The device map includes more than 8 devices and the boot device is out of range. -The range is limited by BIOS to the first 8 devices."), +The range is limited by BIOS to the first 8 devices. Adjust BIOS boot order ( or if it already set, then correct order in bootloader configuration)"), ] ); } -- 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] r62536 - /tags/stable-2_20_0/online-update/
by lslezak＠svn2.opensuse.org 05 Oct '10

05 Oct '10

Author: lslezak Date: Tue Oct 5 12:48:57 2010 New Revision: 62536 URL: http://svn.opensuse.org/viewcvs/yast?rev=62536&view=rev Log: Created tag stable-2_20_0 for online-update Added: tags/stable-2_20_0/online-update/ - copied from r62535, 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] r62535 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/online_update_select.ycp
by lslezak＠svn2.opensuse.org 05 Oct '10

05 Oct '10

Author: lslezak Date: Tue Oct 5 12:48:01 2010 New Revision: 62535 URL: http://svn.opensuse.org/viewcvs/yast?rev=62535&view=rev Log: - install yast2-online-update-configuration package if needed (bnc#609778) - 2.20.0 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/online_update_select.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=62535&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Tue Oct 5 12:48:01 2010 @@ -1 +1 @@ -2.19.2 +2.20.0 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 Tue Oct 5 12:48:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 5 10:47:00 UTC 2010 - lslezak(a)suse.cz + +- install yast2-online-update-configuration package if needed + (bnc#609778) +- 2.20.0 + +------------------------------------------------------------------- Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/online-update/src/online_update_select.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update_… ============================================================================== --- trunk/online-update/src/online_update_select.ycp (original) +++ trunk/online-update/src/online_update_select.ycp Tue Oct 5 12:48:01 2010 @@ -16,6 +16,8 @@ import "Popup"; import "ProductFeatures"; import "Wizard"; + import "PackageSystem"; + import "Report"; // target and source already initialized in online_update.ycp @@ -132,7 +134,21 @@ { any result = nil; if (ret == `online_update_configuration) - result = WFM::CallFunction ("online_update_configuration", []); + { + string required_package = "yast2-online-update-configuration"; + + if (!PackageSystem::Installed( required_package ) && !PackageSystem::CheckAndInstallPackages([required_package]) ) + { + Report::Error( sformat(_("Cannot configure online update repository +without having package %1 installed"), required_package)); + } + else + { + y2milestone("starting online_update_configuration client"); + symbol cfg_result = (symbol)WFM::CallFunction( "online_update_configuration", []); + y2milestone("online_update_configuration result: %1", cfg_result); + } + } else result = WFM::CallFunction ("repositories", [`sw_single_mode]); -- 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] r62534 - /tags/stable-2_20_1/packager/
by lslezak＠svn2.opensuse.org 05 Oct '10

05 Oct '10

Author: lslezak Date: Tue Oct 5 12:47:30 2010 New Revision: 62534 URL: http://svn.opensuse.org/viewcvs/yast?rev=62534&view=rev Log: Created tag stable-2_20_1 for packager Added: tags/stable-2_20_1/packager/ - copied from r62533, 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] r62533 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/sw_single.ycp
by lslezak＠svn2.opensuse.org 05 Oct '10

05 Oct '10

Author: lslezak Date: Tue Oct 5 12:46:33 2010 New Revision: 62533 URL: http://svn.opensuse.org/viewcvs/yast?rev=62533&view=rev Log: - install yast2-online-update-configuration package if needed (bnc#609778) - 2.20.1 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/sw_single.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62533&r1=62… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Oct 5 12:46:33 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 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 Oct 5 12:46:33 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 5 10:45:54 UTC 2010 - lslezak(a)suse.cz + +- install yast2-online-update-configuration package if needed + (bnc#609778) +- 2.20.1 + +------------------------------------------------------------------- Fri Sep 10 12:23:08 UTC 2010 - lslezak(a)suse.cz - make "Medium #" more translation friendly (bnc#612977), 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 Tue Oct 5 12:46:33 2010 @@ -522,7 +522,19 @@ } else if (result == `online_update_configuration) { - symbol online_result = (symbol)WFM::CallFunction( "online_update_configuration", []); + string required_package = "yast2-online-update-configuration"; + + if (!PackageSystem::Installed( required_package ) && + !PackageSystem::CheckAndInstallPackages([required_package]) ) + { + Report::Error( sformat(_("Cannot configure online update repository +without having package %1 installed"), required_package)); + } + else + { + symbol cfg_result = (symbol)WFM::CallFunction( "online_update_configuration", []); + y2milestone("online_update_configuration result: %1", cfg_result); + } force_restart = true; } else if (result == `webpin) -- 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] r62532 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/MdPartCo.cc libstorage/src/MdPartCo.h package/yast2-storage.changes
by aschnell＠svn2.opensuse.org 05 Oct '10

05 Oct '10

Author: aschnell Date: Tue Oct 5 10:25:54 2010 New Revision: 62532 URL: http://svn.opensuse.org/viewcvs/yast?rev=62532&view=rev Log: - do not read /var/run/mdadm/map since the UUID is "reversed" depending on metadata version and endianness Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.h branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc Tue Oct 5 10:25:54 2010 @@ -1751,30 +1751,6 @@ } } -bool MdPartCo::findMdMap(std::ifstream& file) -{ - const char* mdadm_map[] = {"/var/run/mdadm/map", - "/var/run/mdadm.map", - "/dev/.mdadm.map", - 0}; - classic(file); - int i=0; - while( mdadm_map[i] ) - { - file.open( mdadm_map[i] ); - if( file.is_open() ) - { - return true; - } - else - { - i++; - } - } - y2war(" Map File not found"); - return false; -} - /* Will try to set: UUID, Name.*/ /* Format: mdX metadata uuid /dev/md/md_name */ @@ -1786,33 +1762,7 @@ uuid.clear(); mdName.clear(); - /* Got file, now parse output. */ - if( MdPartCo::findMdMap(file) ) - { - while( !file.eof() ) - { - string val; - getline(file,line); - val = extractNthWord( MAP_DEV, line ); - if( val == dev ) - { - size_t pos; - uuid = extractNthWord( MAP_UUID, line ); - val = extractNthWord( MAP_NAME, line ); - // if md_name then /dev/md/name other /dev/mdxxx - if( val.find("/md/")!=string::npos) - { - pos = val.find_last_of("/"); - mdName = val.substr(pos+1); - } - file.close(); - return true; - } - } - file.close(); - } - else - { + string tmp; string::size_type pos; //No file, employ mdadm -D name --export @@ -1839,7 +1789,7 @@ { return true; } - } + return false; } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.h Tue Oct 5 10:25:54 2010 @@ -319,10 +319,6 @@ /* returns devices listed as slaves in sysfs directory */ void getSlaves(const string name, std::list<string>& devs_list ); - /* fields in 'map' file */ - enum mdMap { MAP_DEV=0, MAP_META, MAP_UUID, MAP_NAME, }; - static bool findMdMap(std::ifstream& file); - string getContMember() const; //Input: 'mdXXX' device. Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue Oct 5 10:25:54 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 05 10:21:24 CEST 2010 - aschnell(a)suse.de + +- do not read /var/run/mdadm/map since the UUID is "reversed" + depending on metadata version and endianness + +------------------------------------------------------------------- Mon Aug 16 11:41:30 CEST 2010 - fehr(a)suse.de - backport support for 4k disks and adapted disk layout 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] r62531 - in /trunk/gtk/src/pkg: ygtkpkghistorydialog.cc ygtkpkgmenubar.cc
by rpmcruz＠svn2.opensuse.org 04 Oct '10

04 Oct '10

Author: rpmcruz Date: Mon Oct 4 22:51:42 2010 New Revision: 62531 URL: http://svn.opensuse.org/viewcvs/yast?rev=62531&view=rev Log: String change: "Logs" -> "History" Modified: trunk/gtk/src/pkg/ygtkpkghistorydialog.cc trunk/gtk/src/pkg/ygtkpkgmenubar.cc Modified: trunk/gtk/src/pkg/ygtkpkghistorydialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkghistorydialog… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkghistorydialog.cc (original) +++ trunk/gtk/src/pkg/ygtkpkghistorydialog.cc Mon Oct 4 22:51:42 2010 @@ -412,7 +412,7 @@ static void save_to_file (GtkWindow *parent) { - GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Save logs to"), parent, + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Save to"), parent, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), TRUE); @@ -618,7 +618,7 @@ GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_OTHER, GTK_BUTTONS_NONE, - _("Logs (%s)"), FILENAME); + _("History (%s)"), FILENAME); gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_JUMP_TO, 1); gtk_dialog_add_button (GTK_DIALOG (dialog), _("Save to File"), 2); gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); Modified: trunk/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgmenubar.cc?re… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgmenubar.cc Mon Oct 4 22:51:42 2010 @@ -734,7 +734,7 @@ append_menu_item (submenu, _("Show Changes"), NULL, G_CALLBACK (show_pkg_changes_cb), this); if (!selector->onlineUpdateMode()) - append_menu_item (submenu, _("Show Logs"), NULL, + append_menu_item (submenu, _("Show History"), NULL, G_CALLBACK (show_log_changes_cb), this); append_menu_item (submenu, NULL, NULL, NULL, NULL); append_menu_item (submenu, _("Install All Matching -devel Packages"), NULL, -- 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] r62530 - in /trunk/gtk/src: ygtksteps.c ygtktreeview.c ygtkwizard.c
by rpmcruz＠svn2.opensuse.org 04 Oct '10

04 Oct '10

Author: rpmcruz Date: Mon Oct 4 18:06:50 2010 New Revision: 62530 URL: http://svn.opensuse.org/viewcvs/yast?rev=62530&view=rev Log: Forgot about a couple of files... Modified: trunk/gtk/src/ygtksteps.c trunk/gtk/src/ygtktreeview.c trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/src/ygtksteps.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtksteps.c?rev=62530&r1… ============================================================================== --- trunk/gtk/src/ygtksteps.c (original) +++ trunk/gtk/src/ygtksteps.c Mon Oct 4 18:06:50 2010 @@ -6,7 +6,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include <config.h> Modified: trunk/gtk/src/ygtktreeview.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtktreeview.c?rev=62530… ============================================================================== --- trunk/gtk/src/ygtktreeview.c (original) +++ trunk/gtk/src/ygtktreeview.c Mon Oct 4 18:06:50 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include <config.h> Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=62530&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Mon Oct 4 18:06:50 2010 @@ -6,7 +6,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include <config.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] r62529 - in /trunk/gtk: ./ package/ src/ src/pkg/
by rpmcruz＠svn2.opensuse.org 04 Oct '10

04 Oct '10

Author: rpmcruz Date: Mon Oct 4 17:58:48 2010 New Revision: 62529 URL: http://svn.opensuse.org/viewcvs/yast?rev=62529&view=rev Log: * src/*.cc & src/pkg/*.cc: general string review, and text domain change from "yast2-gtk" to "gtk". * src/pkg/ygtkpkgdetailview.cc: on the dependencies expander, show '"' for available version information when that text is the same of the installed version. Modified: trunk/gtk/ChangeLog trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/YGProgressBar.cc trunk/gtk/src/YGTable.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGi18n.h trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/pkg-selector-help.cc trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/ygtkpkgfilterview.cc trunk/gtk/src/pkg/ygtkpkghistorydialog.cc trunk/gtk/src/pkg/ygtkpkglistview.cc trunk/gtk/src/pkg/ygtkpkgmenubar.cc trunk/gtk/src/pkg/ygtkpkgpatternview.cc trunk/gtk/src/pkg/ygtkpkgproductdialog.cc trunk/gtk/src/pkg/ygtkpkgquerycombo.cc trunk/gtk/src/pkg/ygtkpkgrpmgroupsview.cc trunk/gtk/src/pkg/ygtkpkgsearchentry.cc trunk/gtk/src/pkg/ygtkpkgstatusbar.cc trunk/gtk/src/pkg/ygtkpkgundolist.cc trunk/gtk/src/pkg/yzypptags.cc trunk/gtk/src/pkg/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62529&r1=62528… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Oct 4 17:58:48 2010 @@ -1,3 +1,12 @@ +2010-10-04 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/*.cc & src/pkg/*.cc: general string review, + and text domain change from "yast2-gtk" to "gtk". + + * src/pkg/ygtkpkgdetailview.cc: on the dependencies + expander, show '"' for available version information + when that text is the same of the installed version. + 2010-09-14 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: fix bug 637761: run 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 Oct 4 17:58:48 2010 @@ -1,9 +1,60 @@ ------------------------------------------------------------------- -Tue Sep 14 14:18:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt +Mon Oct 04 16:21:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt -- 2.21.68 +- 2.21.75 - sw_single: run solver at end, fixes bnc#620513. - got rid of included FindGTK2.cmake module. +- overall string review. +- text domain changed from "yast2-gtk" to "gtk". + +------------------------------------------------------------------- +Thu Sep 30 18:32:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.74 +- rpm spec fix (now compatible for both 11.3 and factory). + +------------------------------------------------------------------- +Tue Sep 14 14:48:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.73 +- sw_single: run solver at end, fixes bnc#620513. + +------------------------------------------------------------------- +Mon Aug 30 18:05:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.72 +- temporarily reverting cmake fixes: we need a 11.3 version +built in order to issue a patch. + +------------------------------------------------------------------- +Mon Aug 30 17:45:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.71 +- fix compilation error on Factory (bnc#635352) +- uploading the 11.3 branch for patching purposes (bnc#624310). + +------------------------------------------------------------------- +Mon Aug 23 00:40:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.70 +- sw_single: package count wrong on the filters box when +show-debug or show-devel when de-selected (bcn#632377) +- fixed potential crash when file picking file of esoteric +filename (bnc#633173) +- window size too small when using big fonts: correlate +window size to font size (bnc#633498) + +------------------------------------------------------------------- +Mon Jul 26 19:28:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.69 +- sw_single: fix file > import / export menu items (bcn#624310) + +------------------------------------------------------------------- +Wed Jul 14 13:39:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.68 +- sw_single: fixed duplicate separator item in context menu. ------------------------------------------------------------------- Wed Jul 14 11:41:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt Modified: trunk/gtk/src/YGProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGProgressBar.cc?rev=625… ============================================================================== --- trunk/gtk/src/YGProgressBar.cc (original) +++ trunk/gtk/src/YGProgressBar.cc Mon Oct 4 17:58:48 2010 @@ -3,7 +3,7 @@ ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #define YUILogComponent "gtk" Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=62529&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Mon Oct 4 17:58:48 2010 @@ -2,7 +2,7 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=62529&r1=625… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Mon Oct 4 17:58:48 2010 @@ -3,7 +3,7 @@ ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include <string.h> Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=62529&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Mon Oct 4 17:58:48 2010 @@ -2,7 +2,7 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #define YUILogComponent "gtk" Modified: trunk/gtk/src/YGi18n.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGi18n.h?rev=62529&r1=62… ============================================================================== --- trunk/gtk/src/YGi18n.h (original) +++ trunk/gtk/src/YGi18n.h Mon Oct 4 17:58:48 2010 @@ -6,7 +6,7 @@ #define YGi18n_h #include <libintl.h> -#define TEXTDOMAIN "yast2-gtk" +#define TEXTDOMAIN "gtk" static inline const char *_(const char *msgid) { return dgettext (TEXTDOMAIN, msgid); } 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 Oct 4 17:58:48 2010 @@ -2,7 +2,7 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/pkg-selector-help.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/pkg-selector-help.cc… ============================================================================== --- trunk/gtk/src/pkg/pkg-selector-help.cc (original) +++ trunk/gtk/src/pkg/pkg-selector-help.cc Mon Oct 4 17:58:48 2010 @@ -2,7 +2,7 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -760,22 +760,27 @@ Ypp::Selectable sel = list.get (0); clear(); - std::string i (""), _i (""); - std::string installed_str (i + _("Installed Version") + _i); - std::string candidate_str (i + _("Available Version") + _i); - if (sel.hasInstalledVersion()) + std::string i (""), _i (""), b (""), _b (""); + std::string installed_str (i + b + _("Installed Version:") + _b + _i); + std::string candidate_str (i + b + _("Available Version:") + _b + _i); + bool hasInstalled = sel.hasInstalledVersion(), + hasCandidate = sel.hasCandidateVersion(); + if (hasInstalled) installed_str += " " + sel.installed().number(); - if (sel.hasCandidateVersion()) + if (hasCandidate) candidate_str += " " + sel.candidate().number(); addLine ("", installed_str, candidate_str, -1); for (int dep = 0; dep < VersionDependencies::total(); dep++) { std::string inst, cand; - if (sel.hasInstalledVersion()) + if (hasInstalled) inst = VersionDependencies (sel.installed()).getText (dep); - if (sel.hasCandidateVersion()) + if (hasCandidate) cand = VersionDependencies (sel.candidate()).getText (dep); - if (!inst.empty() || !cand.empty()) + if (!inst.empty() || !cand.empty()) { + if (inst == cand) + cand = i + _("idem") + _i; addLine (VersionDependencies::getLabel (dep), inst, cand, dep); + } } gtk_widget_show_all (vbox); } 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 Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -199,12 +199,12 @@ } else { // Translators: "Any status" may be translated as "All statuses" (whichever's smaller) - addRow (NULL, _("Any status"), true, 0); + addRow (NULL, _("All packages"), true, 0); // Translators: this refers to the package status addRow (NULL, _("Not installed"), true, 0); addRow (NULL, _("Installed"), true, 0); // Translators: refers to package status: may be translated as "Upgrade" - addRow (NULL, _("Upgradable"), true, 0, false); + addRow (NULL, _("Upgrades"), true, 0, false); // Translators: this refers to the package status addRow (NULL, _("Locked"), true, 0, false); addRow (NULL, _("Modified"), true, 0, false); @@ -270,7 +270,7 @@ GtkWidget *hbox = gtk_hbox_new (FALSE, 6), *button, *icon; // Translators: if you prefer, translate this as "Apply Patches" - button = gtk_button_new_with_label (_("Upgrade Patches")); + button = gtk_button_new_with_label (_("Apply Patches")); gtk_widget_set_sensitive (button, hasPatches); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (upgrade_patches_clicked_cb), this); @@ -564,7 +564,7 @@ YGtkPkgPriorityModel::YGtkPkgPriorityModel() { // Translators: "Any priority" may be translated as "All priorities" (whichever's smaller) - addRow (NULL, _("Any priority"), true, 0); + addRow (NULL, _("All patches"), true, 0); for (int i = 0; i < Ypp::Patch::priorityTotal(); i++) addRow (NULL, Ypp::Patch::prioritySummary (i), true, 0, false); } Modified: trunk/gtk/src/pkg/ygtkpkghistorydialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkghistorydialog… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkghistorydialog.cc (original) +++ trunk/gtk/src/pkg/ygtkpkghistorydialog.cc Mon Oct 4 17:58:48 2010 @@ -1,11 +1,11 @@ /******************************************************************** * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ -/* YGtkPkgMenuBar, menu bar */ +/* YGtkPkgHistoryDialog, dialog */ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -47,8 +47,11 @@ { if (reqby.empty()) return _("automatic"); - if (reqby.compare (0, 4, "root", 4) == 0) - return _("user: root"); + if (reqby.compare (0, 4, "root", 4) == 0) { + std::string str (_("user:")); + str += " root"; + return str; + } return reqby; } @@ -508,7 +511,7 @@ GtkCellRenderer *renderer, *pix_renderer; GtkTreeViewColumn *column; - GtkWidget *log_view = ygtk_tree_view_new (_("No log entries.")); + GtkWidget *log_view = ygtk_tree_view_new (_("No entries.")); gtk_tree_view_set_search_column (GTK_TREE_VIEW (log_view), LogListHandler::SHORTCUT_COLUMN); gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (log_view), TRUE); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (log_view), TRUE); @@ -615,7 +618,7 @@ GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_OTHER, GTK_BUTTONS_NONE, - _("History of Changes (%s)"), FILENAME); + _("Logs (%s)"), FILENAME); gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_JUMP_TO, 1); gtk_dialog_add_button (GTK_DIALOG (dialog), _("Save to File"), 2); gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); Modified: trunk/gtk/src/pkg/ygtkpkglistview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkglistview.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkglistview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkglistview.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #define YUILogComponent "gtk" @@ -940,8 +940,10 @@ text = _("To remove"); else if (sel.isInstalled()) { text = _("Installed"); - if (sel.hasUpgrade()) - text += _(" (upgrade available)"); + if (sel.hasUpgrade()) { + text += " "; + text += _("(upgrade available)"); + } } else text = _("Not installed"); @@ -982,7 +984,7 @@ std::string getRepositoryLabel (Ypp::Repository &repo) { std::string name (repo.name()), url, str; - url = repo.isSystem() ? _("Local database") : repo.url(); + url = repo.isSystem() ? _("System") : repo.url(); str.reserve (name.size() + url.size() + 64); str = name + "\n"; str += ""; Modified: trunk/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgmenubar.cc?re… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgmenubar.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -214,7 +214,7 @@ static void import_file_cb (GtkMenuItem *item) { - GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Load Package List"), + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Import"), YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); @@ -290,10 +290,10 @@ YGPackageSelector::get()->popupChanges(); } - catch ( const zypp::Exception & exception ) + catch (const zypp::Exception & exception) { yuiWarning() << "Error reading package list from " << filename << endl; - char *text = g_strdup_printf (_("Error loading package list from '%s'"), filename); + char *text = g_strdup_printf (_("Could not load package list: '%s'"), filename); errorMsg (text); g_free (text); } @@ -307,7 +307,7 @@ static void export_file_cb (GtkMenuItem *item) { - GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Save Package List"), + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export"), YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); @@ -364,7 +364,7 @@ g_remove (filename); // Post error popup - char *text = g_strdup_printf (_("Error exporting package list to '%s'"), filename); + char *text = g_strdup_printf (_("Could not export package list: '%s'"), filename); errorMsg (text); g_free (text); } @@ -379,13 +379,13 @@ { const char *dirname = "/var/log/YaST2/solverTestcase"; std::string msg = _("Use this to generate extensive logs to help tracking down " - "bugs in the dependency resolver.\nThe logs will be stored in " + "bugs in the dependency solver.\nThe logs will be stored in " "directory: "); msg += dirname; GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, - "%s", _("Create Dependency Resolver Test Case")); + "%s", _("Create Dependency Solver Test Case")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", msg.c_str()); int ret = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -400,11 +400,11 @@ GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _("Success")); - msg = _("Dependency resolver test case written to"); + msg = _("Dependency solver test case written to"); msg += " <tt>"; msg += dirname; msg += "</tt>\n"; - msg += _("Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?"); + msg += _("Also create a <tt>y2logs.tgz</tt> tar archive to attach to bugzilla?"); gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", msg.c_str()); ret = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -413,7 +413,7 @@ YGUI::ui()->askSaveLogs(); } else { - msg = _("Failed to create dependency resolver test case.\n" + msg = _("Failed to create dependency solver test case.\n" "Please check disk space and permissions for"); msg += " <tt>"; msg += dirname; @@ -731,10 +731,10 @@ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); append_menu_item (submenu, _("Show Products"), NULL, G_CALLBACK (show_products_cb), this); - append_menu_item (submenu, _("Show Package Changes"), NULL, + append_menu_item (submenu, _("Show Changes"), NULL, G_CALLBACK (show_pkg_changes_cb), this); if (!selector->onlineUpdateMode()) - append_menu_item (submenu, _("Show History of Changes"), NULL, + append_menu_item (submenu, _("Show Logs"), NULL, G_CALLBACK (show_log_changes_cb), this); append_menu_item (submenu, NULL, NULL, NULL, NULL); append_menu_item (submenu, _("Install All Matching -devel Packages"), NULL, @@ -744,7 +744,7 @@ append_menu_item (submenu, _("Install All Matching -debug-source Packages"), NULL, G_CALLBACK (install_all_debug_source_pkgs_cb), this); append_menu_item (submenu, NULL, NULL, NULL, NULL); - append_menu_item (submenu, _("Generate Dependency Resolver Test Case"), NULL, + append_menu_item (submenu, _("Generate Dependency Solver Test Case"), NULL, G_CALLBACK (create_solver_testcase_cb), this); append_menu_item (submenu, _("Reset Ignored Dependency Conflicts"), NULL, G_CALLBACK (reset_ignored_dependency_conflicts_cb), this); Modified: trunk/gtk/src/pkg/ygtkpkgpatternview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgpatternview.c… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgpatternview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgpatternview.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/ygtkpkgproductdialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgproductdialog… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgproductdialog.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgproductdialog.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/ygtkpkgquerycombo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgquerycombo.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgquerycombo.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgquerycombo.cc Mon Oct 4 17:58:48 2010 @@ -1,10 +1,13 @@ /******************************************************************** * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ -/* Textdomain "yast2-gtk" */ /* YGtkPkgQueryCombo, an umbrella for any group of QueryWidget widgets */ // check the header file for information about this widget +/* + Textdomain "yast2-gtk" + */ + #define YUILogComponent "gtk-pkg" #include "YGi18n.h" #include "config.h" Modified: trunk/gtk/src/pkg/ygtkpkgrpmgroupsview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgrpmgroupsview… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgrpmgroupsview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgrpmgroupsview.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" 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 Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -237,7 +237,7 @@ break; case 2: { GtkWidget *label = gtk_label_new ( - _("Search by file name is only reliable for installed packages.")); + _("Search by file name only reliable for installed packages.")); gtk_misc_set_alignment (GTK_MISC (label), 0, .5); GtkWidget *icon = gtk_image_new_from_stock ( GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); 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 Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/ygtkpkgundolist.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgundolist.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgundolist.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgundolist.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this utility /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/yzypptags.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzypptags.cc?rev=625… ============================================================================== --- trunk/gtk/src/pkg/yzypptags.cc (original) +++ trunk/gtk/src/pkg/yzypptags.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this translator /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -28,11 +28,16 @@ case YPKG_GROUP_PROGRAMMING: return _( "Programming" ); case YPKG_GROUP_MULTIMEDIA: return _( "Multimedia" ); case YPKG_GROUP_SYSTEM: return _( "System" ); + // Translators: keep translation short case YPKG_GROUP_DESKTOP_GNOME: return _( "Desktop (GNOME)" ); + // Translators: keep translation short case YPKG_GROUP_DESKTOP_KDE: return _( "Desktop (KDE)" ); + // Translators: keep translation short case YPKG_GROUP_DESKTOP_XFCE: return _( "Desktop (XFCE)" ); + // Translators: keep translation short case YPKG_GROUP_DESKTOP_OTHER: return _( "Desktop (Others)" ); case YPKG_GROUP_PUBLISHING: return _( "Publishing" ); + // Translators: keep translation short case YPKG_GROUP_ADMIN_TOOLS: return _( "Admin Tools" ); case YPKG_GROUP_LOCALIZATION: return _( "Localization" ); case YPKG_GROUP_SECURITY: return _( "Security" ); @@ -41,10 +46,10 @@ case YPKG_GROUP_DOCUMENTATION: return _( "Documentation" ); case YPKG_GROUP_UTILITIES: return _( "Utilities" ); - case YPKG_GROUP_UNKNOWN: return _( "Unknown Group" ); + case YPKG_GROUP_UNKNOWN: return _( "Unknown" ); case YPKG_GROUP_SUGGESTED: return _( "Suggested" ); case YPKG_GROUP_RECOMMENDED: return _( "Recommended" ); - case YPKG_GROUP_ORPHANED: return _( "Orphaned" ); + case YPKG_GROUP_ORPHANED: return _( "Unmaintained" ); case YPKG_GROUP_RECENT: return _( "Recent" ); case YPKG_GROUP_MULTIVERSION: return _( "Multiversion" ); case YPKG_GROUP_TOTAL: break; Modified: trunk/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.cc (original) +++ trunk/gtk/src/pkg/yzyppwrapper.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this wrapper /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "config.h" @@ -145,7 +145,7 @@ int installed, total; col.stats (&installed, &total); std::ostringstream stream; - stream << _("Installed: ") << installed << _(" of ") << total; + stream << _("Installed:") << " " << installed << " " << _("of") << " " << total; return stream.str(); } default: break; @@ -731,11 +731,15 @@ const char *Ypp::Patch::prioritySummary (int priority) { switch (priority) { + // Translators: this refers to patch priority case 0: return _("Security"); + // Translators: this refers to patch priority case 1: return _("Recommended"); case 2: return "YaST"; case 3: return _("Documentation"); + // Translators: this refers to patch priority case 4: return _("Optional"); + // Translators: this refers to patch priority case 5: return _("Other"); } return 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] r62528 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn2.opensuse.org 04 Oct '10

04 Oct '10

Author: aschnell Date: Mon Oct 4 10:12:45 2010 New Revision: 62528 URL: http://svn.opensuse.org/viewcvs/yast?rev=62528&view=rev Log: - determine instsys flag for libstorage on Stage instead of Mode (see bnc #642567) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Oct 4 10:12:45 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 04 10:05:44 CEST 2010 - aschnell(a)suse.de + +- determine instsys flag for libstorage on Stage instead of Mode + (see bnc #642567) + +------------------------------------------------------------------- Thu Sep 23 12:33:40 CEST 2010 - aschnell(a)suse.de - do not allow resizing of VFAT on logical volumes Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Oct 4 10:12:45 2010 @@ -307,7 +307,7 @@ any env = LibStorage::Environment::new("LibStorage::Environment", readonly); LibStorage::Environment::swig_testmode_set(env, Mode::test()); LibStorage::Environment::swig_autodetect_set(env, !Mode::test()); - LibStorage::Environment::swig_instsys_set(env, Mode::installation() || Mode::repair()); + LibStorage::Environment::swig_instsys_set(env, Stage::initial() || Mode::repair()); integer locker_pid = 0; sint = LibStorage::createStorageInterfacePid(env, locker_pid); -- 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] r62527 - /trunk/gtk/tests/FileDialog.ycp
by rpmcruz＠svn2.opensuse.org 03 Oct '10

03 Oct '10

Author: rpmcruz Date: Sun Oct 3 17:00:20 2010 New Revision: 62527 URL: http://svn.opensuse.org/viewcvs/yast?rev=62527&view=rev Log: Fixed test case. Modified: trunk/gtk/tests/FileDialog.ycp Modified: trunk/gtk/tests/FileDialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/FileDialog.ycp?rev=625… ============================================================================== --- trunk/gtk/tests/FileDialog.ycp (original) +++ trunk/gtk/tests/FileDialog.ycp Sun Oct 3 17:00:20 2010 @@ -50,13 +50,14 @@ UI::CloseDialog(); if (action == `open_file) - ret_path = UI::AskForSaveFileName (start_path, filter_str, "Choose a File"); + ret_path = UI::AskForExistingFile (start_path, filter_str, "Choose a File"); else if (action == `save_file) ret_path = UI::AskForSaveFileName (start_path, filter_str, "Choose a File"); else if (action == `select_folder) - ret_path = UI::AskForSaveFileName (start_path, filter_str, "Choose a Folder"); + ret_path = UI::AskForExistingDirectory (start_path, "Choose a Folder"); - if (ret_path != nil) - show_selected (ret_path); + if (ret_path == nil) + ret_path = "(none)"; + show_selected (ret_path); } } -- 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] r62526 - /branches/tmp/jsrain/unattended-migration/installation/src/clients/save_config_finish.ycp
by jsrain＠svn2.opensuse.org 01 Oct '10

01 Oct '10

Author: jsrain Date: Fri Oct 1 13:47:31 2010 New Revision: 62526 URL: http://svn.opensuse.org/viewcvs/yast?rev=62526&view=rev Log: save AutoYaST profile Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/save_config_finish.ycp Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/src/clients/save_config_finish.ycp (original) +++ branches/tmp/jsrain/unattended-migration/installation/src/clients/save_config_finish.ycp Fri Oct 1 13:47:31 2010 @@ -122,7 +122,7 @@ // progress step title Progress::Title (_("Saving product information...")); ProductFeatures::Save(); - if (Mode::autoinst ()) + if (Mode::autoinst () || Mode::autoupgrade()) { Progress::NextStep (); // progress step title -- 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] r62525 - /branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp
by jsrain＠svn2.opensuse.org 01 Oct '10

01 Oct '10

Author: jsrain Date: Fri Oct 1 13:10:05 2010 New Revision: 62525 URL: http://svn.opensuse.org/viewcvs/yast?rev=62525&view=rev Log: set root partition properly Modified: branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp Modified: branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp (original) +++ branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp Fri Oct 1 13:10:05 2010 @@ -29,6 +29,8 @@ map<string,map> partitions = filter (string name, map p, RootPart::rootPartitions, { + if (p[`valid]:false) + target_system = name; return p[`valid]:false; }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0