Merged changes from trunk into 10.2 branch

svn path=/branches/SuSE-Linux-10_2-Branch/ncurses/; revision=34680
libyui · Dec 1, 2006 · 8c87a1d · 8c87a1d
1 parent e68f271
commit 8c87a1d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/PackageSelector.cc b/src/PackageSelector.cc
@@ -1168,20 +1168,33 @@ bool PackageSelector::checkPatch( ZyppPatch 	patchPtr,
 	    if ( selectable->installedPoolItem().status().isIncomplete() )
 	    {
 		displayPatch = true;
-		NCMIL << "Installed patch is broken: " << patchPtr->name().c_str() << " - "
+		NCWAR << "Installed patch is broken: " << patchPtr->name().c_str() << " - "
 		      << patchPtr->summary().c_str() << endl;
 	    }
 	}
 	else // patch not installed
-	{
-	    zypp::ResStatus candidateStatus = selectable->candidatePoolItem().status();
+
+	{ 
+	    if (selectable->hasCandidateObj() && 
+		selectable->candidatePoolItem().status().isSatisfied() )
+	    {
+		//patch not installed, but it is satisfied (updated to the version patch requires)
+		//all that is missing are patch metadata, so let's display the patch
+
+		displayPatch = true;
+
+		NCMIL << "Patch satisfied, but not installed yet: " << patchPtr->name().c_str() << " - "
+		      << patchPtr->summary().c_str() << endl;
+	    }
+	}
+
+	if (selectable->hasCandidateObj()) {
 
             // isNeeded(): this patch is relevant (contains updates for installed packages)
 	    // isSatisfied(): all packages are installed, therefore the isNeeded() flag
 	    // isn't set. BUT the patch meta data aren't installed and therefore it makes
 	    // sense to install the patch
-	    if ( candidateStatus.isNeeded() ||
-		 candidateStatus.isSatisfied() )
+	    if ( selectable->candidatePoolItem().status().isNeeded()) 
 	    {
 		displayPatch = true;
 	    }

diff --git a/src/pkg_layout.ycp b/src/pkg_layout.ycp
@@ -111,13 +111,13 @@
 			    ),
 		  // label text - keep it short
 		  `HBox( `HWeight(1, `HBox(`Label( _( "Filter: " ) ),
-					   `Label( `id("filter"), "........................." ),
+					   `Label( `id("filter"), "..............................." ),
 					   `HSpacing( 0.1 )
 					   )
 				  ),
 			 // label text - keep it short (use abbreviation if necessary)
 			 `HWeight(1, `HBox(`Label( _( "Required Disk Space: " ) ),
-					   `Label( `id("diskspace"), "         " ),
+					   `Label( `id("diskspace"), "        " ),
 					   `HSpacing( 0.1 )
 					   )
 				  )