Attachment 180108 Details for Bug 336124

[patch] Patch for updated patch display logic

yast2-gtk-patches-shown.patch (text/plain), 3.29 KB, created by JP Rosevear on 2007-10-23 19:32:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: JP Rosevear

Created: 2007-10-23 19:32:16 UTC

Size: 3.29 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>--- ChangeLog	(revision 41530)
>+++ ChangeLog	(working copy)
>@@ -1,3 +1,9 @@
>+2007-10-23  JP Rosevear  <jpr@novell.com>
>+
>+	* src/YGPackageSelector.cc (class YGPatchSelector): Use the more
>+	sophisticated logic taken from YQPkgPatchList::fillList to
>+	determine what patches are available (#336124)
>+
> 2007-10-22  Boyd Timothy  <btimothy@novell.com>
> 
> 	* src/YGPackageSelector.cc: Removed the space before the question mark
>Index: src/YGPackageSelector.cc
>===================================================================
>--- src/YGPackageSelector.cc	(revision 41530)
>+++ src/YGPackageSelector.cc	(working copy)
>@@ -904,12 +904,63 @@
> 		     it != zyppPool().byKindEnd <zypp::Patch>(); it++) {
> 			ZyppSelectable selectable = *it;
> 			ZyppPatch patch = tryCastToZyppPatch (selectable->theObj());
>+			bool displayPatch = false;
> 
>-			if (patch && !selectable->hasInstalledObj() &&
>-			    selectable->hasCandidateObj() /*don't show installed ones*/) {
>+			if (!patch)
>+				continue;
>+
>+			// These rules are taken from YQPkgPatchList::fillList() in the RelevantPatches case
>+			if (selectable->hasInstalledObj()) { // installed?
>+				if (selectable->installedPoolItem().status().isIncomplete()) { // patch broken?
>+					// The patch is broken: It had been installed, but the user somehow
>+					// downgraded individual packages belonging to the patch to older versions.
>+					displayPatch = true;
>+
>+					y2warning( "Installed patch is broken: %s - %s",
>+						   patch->name().c_str(),
>+						   patch->summary().c_str() );
>+				}
>+			} else { // not installed
>+				if (selectable->hasCandidateObj() && selectable->candidatePoolItem().status().isSatisfied()) {
>+					// This is a pretty exotic case, but still it might happen:
>+					//
>+					// The patch itelf is not installed, but it is satisfied because the
>+					// user updated all the packages belonging to the patch to the versions
>+					// the patch requires. All that is missing now is to get the patch meta
>+					// data onto the system. So let's display the patch to give the user
>+					// a chance to install it (if he so chooses).
>+
>+					displayPatch = true;
>+					
>+					y2milestone( "Patch satisfied, but not installed yet: %s - %s",
>+						     patch->name().c_str(),
>+						     patch->summary().c_str() );
>+				}
>+			}
>+
>+			if (selectable->hasCandidateObj()) {	// candidate available?
>+				// The most common case: There is a candidate patch, i.e. one that could be
>+				// installed, but either no version of that patch is installed or there is a
>+				// newer one to which the patch could be updated.
>+				
>+				if (selectable->candidatePoolItem().status().isNeeded()) { // patch really needed?
>+					// Patches are needed if any of the packages that belong to the patch
>+					// are installed on the system.
>+					
>+					displayPatch = true;
>+				} else {
>+					// None of the packages that belong to the patch is installed on the system.
>+					
>+					y2debug( "Patch not needed: %s - %s",
>+						 patch->name().c_str(),
>+						 patch->summary().c_str() );
>+				}
>+			}
>+
>+			if (displayPatch) {
> 				// select them all
> 				selectable->set_status (zypp::ui::S_Install);
>-
>+				
> 				GtkTreeIter iter;
> 				GtkListStore *store = GTK_LIST_STORE (m_patches_model);
> 				gtk_list_store_append (store, &iter);

Actions: View | Diff

Attachments on bug 336124: 180108