October 2010 - YaST Commits - openSUSE Mailing Lists

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

14 Oct '10

Author: lslezak Date: Thu Oct 14 15:14:41 2010 New Revision: 62637 URL: http://svn.opensuse.org/viewcvs/yast?rev=62637&view=rev Log: - offer also Ignore/Retry when a patch script fails during system installation (do not abort leaving inconsistent system) (bnc#633447) - 2.20.4 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SlideShowCallbacks.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62637&r1=62… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Oct 14 15:14:41 2010 @@ -1 +1 @@ -2.20.3 +2.20.4 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Oct 14 15:14:41 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Oct 14 13:06:14 UTC 2010 - lslezak(a)suse.cz + +- offer also Ignore/Retry when a patch script fails during system + installation (do not abort leaving inconsistent system) + (bnc#633447) +- 2.20.4 + +------------------------------------------------------------------- Tue Oct 12 13:32:37 UTC 2010 - lslezak(a)suse.cz - don't use obsoleted inst_packages.ycp client, use PackagesUI.ycp Modified: trunk/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShowCa… ============================================================================== --- trunk/packager/src/modules/SlideShowCallbacks.ycp (original) +++ trunk/packager/src/modules/SlideShowCallbacks.ycp Thu Oct 14 15:14:41 2010 @@ -179,12 +179,8 @@ global string ScriptProblem(string description) { - y2milestone("ScriptProblem: %1", description); - Popup::Error(description); - - // Abort - // TODO: support also Ignore and Retry - return "A"; + // display Abort/Retry/Ignore popup + return PackageCallbacks::ScriptProblem(description); } global void ScriptFinish() -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62636 - in /branches/SuSE-Code-11-SP2-Branch/sound: package/yast2-sound.changes sound/src/joy_dialog.ycp
by lslezak＠svn2.opensuse.org 14 Oct '10

14 Oct '10

Author: lslezak Date: Thu Oct 14 14:45:12 2010 New Revision: 62636 URL: http://svn.opensuse.org/viewcvs/yast?rev=62636&view=rev Log: - make the joystick dialog label better translatable in RTL languages (bnc#583209) Modified: branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes branches/SuSE-Code-11-SP2-Branch/sound/sound/src/joy_dialog.ycp 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 Thu Oct 14 14:45:12 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 14 12:32:32 UTC 2010 - lslezak(a)suse.cz + +- make the joystick dialog label better translatable in RTL + languages (bnc#583209) + +------------------------------------------------------------------- Tue Oct 12 10:53:46 UTC 2010 - lslezak(a)suse.cz - added Creative X-Fi to sound card DB (bnc#613746) Modified: branches/SuSE-Code-11-SP2-Branch/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/sound/src/joy_dialog.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/sound/src/joy_dialog.ycp Thu Oct 14 14:45:12 2010 @@ -409,9 +409,8 @@ cardname = card["name"]:""; }); - // dialog header - string caption = _("Joystick Configuration") + - sformat (" - %1 (snd-card-%2)", cardname, card_id); + // dialog header - %1: card name (e.g "Soundblaster 16"), %2: card ID (a number) + string caption = sformat(_("Joystick Configuration - %1 (snd-card-%2)"), cardname, card_id); string helptext = // help text for joystick configuration 1/4 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62635 - in /trunk/sound: package/yast2-sound.changes sound/src/joy_dialog.ycp
by lslezak＠svn2.opensuse.org 14 Oct '10

14 Oct '10

Author: lslezak Date: Thu Oct 14 14:44:18 2010 New Revision: 62635 URL: http://svn.opensuse.org/viewcvs/yast?rev=62635&view=rev Log: - make the joystick dialog label better translatable in RTL languages (bnc#583209) Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/joy_dialog.ycp Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Thu Oct 14 14:44:18 2010 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 14 12:32:32 UTC 2010 - lslezak(a)suse.cz + +- make the joystick dialog label better translatable in RTL + languages (bnc#583209) + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/joy_dialog.ycp?r… ============================================================================== --- trunk/sound/sound/src/joy_dialog.ycp (original) +++ trunk/sound/sound/src/joy_dialog.ycp Thu Oct 14 14:44:18 2010 @@ -409,9 +409,8 @@ cardname = card["name"]:""; }); - // dialog header - string caption = _("Joystick Configuration") + - sformat (" - %1 (snd-card-%2)", cardname, card_id); + // dialog header - %1: card name (e.g "Soundblaster 16"), %2: card ID (a number) + string caption = sformat(_("Joystick Configuration - %1 (snd-card-%2)"), cardname, card_id); string helptext = // help text for joystick configuration 1/4 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62634 - in /branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients: inst_autoinit.ycp inst_store_upgrade_software.ycp
by jsrain＠svn2.opensuse.org 14 Oct '10

14 Oct '10

Author: jsrain Date: Thu Oct 14 12:28:06 2010 New Revision: 62634 URL: http://svn.opensuse.org/viewcvs/yast?rev=62634&view=rev Log: changed path of the profiles in system Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp Thu Oct 14 12:28:06 2010 @@ -191,7 +191,7 @@ any autoinstall = SCR::Read(.etc.install_inf.AutoYaST); if (Mode::autoupgrade() && ! (autoinstall != nil && is ( autoinstall , string ) && (string)autoinstall != "")) { - AutoinstConfig::ParseCmdLine("file:///mnt/autoupg.xml"); + AutoinstConfig::ParseCmdLine("file:///mnt/root/autoupg.xml"); AutoinstConfig::ProfileInRootPart = true; } Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp Thu Oct 14 12:28:06 2010 @@ -24,8 +24,8 @@ patterns_to_install = filter (string p, patterns_to_install, { return p != nil; }); - y2internal ("Patterns to install: %1", patterns_to_install); - y2internal ("Patterns to remove: %1", patterns_to_remove); + y2milestone ("Patterns to install: %1", patterns_to_install); + y2milestone ("Patterns to remove: %1", patterns_to_remove); // find out status of packages list<map<string,any> > packages = Pkg::ResolvableProperties ("", `package, ""); @@ -44,8 +44,8 @@ packages_to_install = filter (string p, packages_to_install, { return p != nil; }); - y2internal ("Packages to install: %1", packages_to_install); - y2internal ("Packages to remove: %1", packages_to_remove); + y2milestone ("Packages to install: %1", packages_to_install); + y2milestone ("Packages to remove: %1", packages_to_remove); map software = $[ "packages": packages_to_install, @@ -55,7 +55,8 @@ ]; Profile::current["software"] = software; - Profile::Save (Installation::destdir + "/autoupg_updated.xml"); + // /root exists during upgrade + Profile::Save (Installation::destdir + "/root/autoupg_updated.xml"); return `auto; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62633 - in /branches/SuSE-Code-11-SP2-Branch/ncurses: package/yast2-ncurses.changes src/NCRichText.cc
by gs＠svn2.opensuse.org 13 Oct '10

13 Oct '10

Author: gs Date: Wed Oct 13 14:39:51 2010 New Revision: 62633 URL: http://svn.opensuse.org/viewcvs/yast?rev=62633&view=rev Log: bug-fix for pre tag Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.cc Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes Wed Oct 13 14:39:51 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 13 14:26:38 CEST 2010 - gs(a)suse.de + +- NCRichText: bug-fix for pre tag (bnc #484629) + +------------------------------------------------------------------- Thu May 6 14:07:23 CEST 2010 - gs(a)suse.de - NCTextPad: do not append \n after the very last line Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.cc Wed Oct 13 14:39:51 2010 @@ -160,6 +160,11 @@ , NCPadWidget( parent ) , text( ntext ) , plainText( plainTextMode ) + , textwidth( 0 ) + , cl( 0 ) + , cc( 0 ) + , cindent( 0 ) + , atbol( true ) , preTag( false ) , Tattr( 0 ) { @@ -447,6 +452,8 @@ { myPad()->addwstr( wch, 1 ); // add the wide chararacter cc += wcwidth( *wch ); + if ( *wch == '\n' ) + PadNL(); } ++wch; } @@ -454,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; @@ -474,6 +483,8 @@ { SkipPreTXT( wch ); PadPlainTXT( swch, wch - swch ); + preTag = false; + PadNL(); // add new line after pre is closed } break; @@ -563,7 +574,8 @@ } /** - * Get the number of columns needed to print a 'wstring'. + * Get the number of columns needed to print a 'wstring'. Only printable characters + * are taken into account because others would return -1 (e.g. '\n'). * Attention: only use textWidth() to calculate space, not for iterating through a text * or to get the length of a text (real text length includes new lines). */ @@ -574,7 +586,9 @@ for ( wstr_it = wstr.begin(); wstr_it != wstr.end() ; ++wstr_it ) { - len += wcwidth( *wstr_it ); + // check whether char is printable + if ( iswprint( *wstr_it ) ) + len += wcwidth( *wstr_it ); } return len; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62632 - /trunk/ncurses/package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 13 Oct '10

13 Oct '10

Author: gs Date: Wed Oct 13 14:30:35 2010 New Revision: 62632 URL: http://svn.opensuse.org/viewcvs/yast?rev=62632&view=rev Log: improve changelog Modified: trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Wed Oct 13 14:30:35 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Oct 12 14:49:51 CEST 2010 - gs(a)suse.de + +- NCRichText: bug-fix for pre tag (bnc #484629) + +------------------------------------------------------------------- Wed May 12 14:55:56 CEST 2010 - gs(a)suse.de - Use ncurses6 library (package libncurses6) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62631 - in /branches/SuSE-Code-11-SP2-Branch/ncurses-pkg: package/yast2-ncurses-pkg.changes src/NCPkgFilterSearch.cc
by gs＠svn2.opensuse.org 13 Oct '10

13 Oct '10

Author: gs Date: Wed Oct 13 14:11:20 2010 New Revision: 62631 URL: http://svn.opensuse.org/viewcvs/yast?rev=62631&view=rev Log: Show error popup if searching for packages throws an exception Modified: branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/src/NCPkgFilterSearch.cc Modified: branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes Wed Oct 13 14:11:20 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 13 13:58:01 CEST 2010 - gs(a)suse.de + +- Show error popup if searching for packages throws an exception + (bnc #615102) + +------------------------------------------------------------------- Tue Jul 27 09:59:58 CEST 2010 - gs(a)suse.de - Show all patterns in 'Filter/Patterns' list Modified: branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/src/NCPkgFilterSearch.cc Wed Oct 13 14:11:20 2010 @@ -223,15 +223,32 @@ _("Searching...") ); info->setPreferredSize( 18, 4 ); - info->popup(); - - for( zypp::PoolQuery::Selectable_iterator it = q.selectableBegin(); - it != q.selectableEnd(); it++) + info->popup(); + + try + { + for( zypp::PoolQuery::Selectable_iterator it = q.selectableBegin(); + it != q.selectableEnd(); it++) + { + ZyppPkg pkg = tryCastToZyppPkg( (*it)->theObj() ); + packageList->createListEntry ( pkg, *it); + } + } + catch (const std::exception & e) { - ZyppPkg pkg = tryCastToZyppPkg( (*it)->theObj() ); - packageList->createListEntry ( pkg, *it); + NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, + NCurses::cols()/10), + NCPkgStrings::ErrorLabel(), + // Popup informs the user that the query string + // entered for package search isn't correct + _("Query Error:") + ("<br>") + e.what(), + NCPkgStrings::OKLabel() ); + info->setPreferredSize( 50, 10 ); + info->showInfoPopup(); + YDialog::deleteTopmostDialog(); + yuiError() << "Caught a std::exception: " << e.what () << endl; } - + info->popdown(); YDialog::deleteTopmostDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62630 - in /branches/tmp/jsrain/unattended-migration/autoinstallation/src: clients/inst_autoinit.ycp modules/AutoInstall.ycp
by jsrain＠svn2.opensuse.org 13 Oct '10

13 Oct '10

Author: jsrain Date: Wed Oct 13 14:00:45 2010 New Revision: 62630 URL: http://svn.opensuse.org/viewcvs/yast?rev=62630&view=rev Log: avoid warning without time-out while probing hardware (happens especially on S/390) Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoInstall.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp Wed Oct 13 14:00:45 2010 @@ -166,6 +166,20 @@ } Progress::Title(_("Probing hardware...")); + // give warnings a time-out + Report::Import($[ + "messages" : $[ + "log": true, + "show": true, + "timeout": 10 + ], + "warnings" : $[ + "log": true, + "show": true, + "timeout": 10 + ] + ]); + if (! (Mode::autoupgrade() && AutoinstConfig::ProfileInRootPart)) WFM::CallFunction("inst_system_analysis", [] ); AutoInstallRules::ProbeRules(); Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoInstall.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoInstall.ycp Wed Oct 13 14:00:45 2010 @@ -153,7 +153,7 @@ */ global define boolean Save() { - if (Mode::autoinst ()) + if (Mode::autoinst () || Mode::autoupgrade()) return (Profile::SaveProfileStructure( AutoinstConfig::parsedControlFile )); else 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] r62629 - /branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/
by gs＠svn2.opensuse.org 13 Oct '10

13 Oct '10

Author: gs Date: Wed Oct 13 13:19:07 2010 New Revision: 62629 URL: http://svn.opensuse.org/viewcvs/yast?rev=62629&view=rev Log: create Code-11-SP2 branch for ncurses-pkg Added: branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/ (props changed) - copied from r62628, branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62628 - /branches/SuSE-Code-11-SP2-Branch/ncurses/
by gs＠svn2.opensuse.org 13 Oct '10

13 Oct '10

Author: gs Date: Wed Oct 13 13:14:26 2010 New Revision: 62628 URL: http://svn.opensuse.org/viewcvs/yast?rev=62628&view=rev Log: create Code-11-SP2 branch for ncurses Added: branches/SuSE-Code-11-SP2-Branch/ncurses/ (props changed) - copied from r62627, branches/SuSE-Code-11-SP1-Branch/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0