Author: jsuchome Date: Wed Jul 1 15:29:08 2009 New Revision: 57821 URL: http://svn.opensuse.org/viewcvs/yast?rev=57821&view=rev Log: - always run Solve and Commit, so product metadata get installed (bnc#517288) - adapt the migration progess to real script output (bnc#518185) - 2.17.7 Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-installation/VERSION?rev=57821&r1=57820&r2=57821&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/pos-installation/VERSION Wed Jul 1 15:29:08 2009 @@ -1 +1 @@ -2.17.6 +2.17.7 Modified: branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes?rev=57821&r1=57820&r2=57821&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes (original) +++ branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes Wed Jul 1 15:29:08 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jul 1 12:08:23 CEST 2009 - jsuchome@suse.cz + +- always run Solve and Commit, so product metadata get installed + (bnc#517288) +- adapt the migration progess to real script output (bnc#518185) +- 2.17.7 + +------------------------------------------------------------------- Wed Jul 1 09:45:01 CEST 2009 - jsuchome@suse.cz - save the content of input boxes (bnc#518061) Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp?rev=57821&r1=57820&r2=57821&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp Wed Jul 1 15:29:08 2009 @@ -70,7 +70,7 @@ y2internal ("new line: '%1'", line); // read total number of tasks - if (substring (line, 0, 6) == "tasks:") + if (substring (line, 0, 7) == "titles:") { list<string> l = splitstring (line, " "); tasks = tointeger (l[1]:"0"); @@ -82,7 +82,7 @@ ); } // update current task label - else if (substring (line, 0, 5) == "task:") + else if (substring (line, 0, 6) == "title:") { list<string> l = splitstring (line, " "); l = remove (l, 0); @@ -98,7 +98,7 @@ else if (substring (line, 0, 9) == "position:") { list<string> l = splitstring (line, " "); - integer pos = tointeger (l[1]:"0"); + integer pos = tointeger (deletechars (l[1]:"0", "% ")); if (pos == nil) pos = 0; UI::ChangeWidget (`id (`current_progress), `Value, pos); Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp?rev=57821&r1=57820&r2=57821&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp Wed Jul 1 15:29:08 2009 @@ -140,16 +140,13 @@ labels)); return manual_package_selection (); } - if (to_install != []) - { - if (Pkg::PkgSolve (false) == true) { + if (Pkg::PkgSolve (false) == true) { Pkg::PkgCommit (0); - } - else { - // TRANSLATORS: Error message - Report::Error (_("An error occured in pattern selection\nStarting manual selection.")); - return manual_package_selection (); - } + } + else { + // TRANSLATORS: Error message + Report::Error (_("An error occured in pattern selection\nStarting manual selection.")); + return manual_package_selection (); } // update the migrate info for the next dialog -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org