Author: jsuchome Date: Thu Mar 26 12:06:46 2009 New Revision: 56417 URL: http://svn.opensuse.org/viewcvs/yast?rev=56417&view=rev Log: - Pkg::ResolvableProperties() can return `removed status for items selected to delete: do not exit YOU (bnc#481101) - 2.13.69 Modified: branches/SuSE-SLE-10-SP3-Branch/online-update/VERSION branches/SuSE-SLE-10-SP3-Branch/online-update/package/yast2-online-update.changes branches/SuSE-SLE-10-SP3-Branch/online-update/src/inst_you.ycp branches/SuSE-SLE-10-SP3-Branch/online-update/src/online_update_select.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/online-update/VERSION?rev=56417&r1=56416&r2=56417&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/online-update/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/online-update/VERSION Thu Mar 26 12:06:46 2009 @@ -1 +1 @@ -2.13.68 +2.13.69 Modified: branches/SuSE-SLE-10-SP3-Branch/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/online-update/package/yast2-online-update.changes?rev=56417&r1=56416&r2=56417&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/online-update/package/yast2-online-update.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/online-update/package/yast2-online-update.changes Thu Mar 26 12:06:46 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 26 10:28:58 CET 2009 - jsuchome@suse.cz + +- Pkg::ResolvableProperties() can return `removed status for + items selected to delete: do not exit YOU (bnc#481101) +- 2.13.69 + +------------------------------------------------------------------- Wed Feb 11 16:01:07 CET 2009 - jsuchome@suse.cz - different progress caption for CD Update (bnc#385186) Modified: branches/SuSE-SLE-10-SP3-Branch/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/online-update/src/inst_you.ycp?rev=56417&r1=56416&r2=56417&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/online-update/src/inst_you.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/online-update/src/inst_you.ycp Thu Mar 26 12:06:46 2009 @@ -171,6 +171,7 @@ list<string> normal_patches = []; boolean reboot_needed = false; + boolean patches_for_removal = false; foreach (map patch, Pkg::ResolvableProperties("", `patch, ""), { if (patch["status"]:`none == `selected) { @@ -191,6 +192,11 @@ reboot_needed = true; } } + else if (patch["status"]:`none == `removed) + { + y2milestone ("patch for removal: %1", patch); + patches_for_removal = true; + } }); // unselect non-affects_pkg_manager patches and save them to file @@ -208,9 +214,9 @@ // ... but there is a patch with "reboot_needed" flag (=probably kernel) if (reboot_needed) ret = `reboot; - // ... and nothing to install -> skip the installation at all - else if (normal_patches == [] && !Pkg::PkgAnyToInstall () && - !Pkg::PkgAnyToDelete ()) + // ... and nothing to install/remove -> skip the installation at all + else if (normal_patches == [] && !patches_for_removal && + !Pkg::PkgAnyToInstall () && !Pkg::PkgAnyToDelete ()) { y2milestone ("no patch selected after all -> `next"); return `next; Modified: branches/SuSE-SLE-10-SP3-Branch/online-update/src/online_update_select.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/online-update/src/online_update_select.ycp?rev=56417&r1=56416&r2=56417&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/online-update/src/online_update_select.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/online-update/src/online_update_select.ycp Thu Mar 26 12:06:46 2009 @@ -114,6 +114,8 @@ list<string> normal_patches = []; boolean more_patches_needed = false; boolean reboot_needed = false; + boolean patches_for_removal = false; + foreach (map patch, Pkg::ResolvableProperties("", `patch, ""), { if (patch["status"]:`none == `selected) { @@ -129,6 +131,11 @@ y2debug ("patch needed but not selected: %1", patch); more_patches_needed = true; } + if (patch["status"]:`none == `removed) + { + y2milestone ("patch for removal: %1", patch); + patches_for_removal = true; + } }); // unselect non-affects_pkg_manager patches and save them to file @@ -143,8 +150,8 @@ reboot_needed = false; } // no patch selected - if (!restart_yast && normal_patches == [] && !Pkg::PkgAnyToInstall () && - !Pkg::PkgAnyToDelete ()) + if (!restart_yast && normal_patches == [] && !patches_for_removal && + !Pkg::PkgAnyToInstall () && !Pkg::PkgAnyToDelete ()) { ret = `cancel; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org