add GM version 2.13.40 to SLE-10-Branch

svn path=/branches/SuSE-SLE-10-Branch/ncurses/; revision=32585
libyui · Aug 26, 2006 · 656e18c · 656e18c
1 parent 4a3be1b
commit 656e18c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.13.39
+2.13.40
diff --git a/package/yast2-ncurses.changes b/package/yast2-ncurses.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jun 20 14:49:52 CEST 2006 - gs@suse.de
+
+- Online Update: don't show the patch size (bug #186100);
+  show the patch summary, if available, else the name of the patch
+  (bug #186209).
+- 2.13.40   
+
 -------------------------------------------------------------------
 Mon Jun 12 17:46:25 CEST 2006 - mvidner@suse.cz
 

diff --git a/src/NCPkgTable.cc b/src/NCPkgTable.cc
@@ -532,8 +532,8 @@ void NCPkgTable::fillHeader( )
 	    header.push_back( "L" + PkgNames::PkgStatus() );
 	    header.push_back( "L" + PkgNames::PkgName() );
 	    header.push_back( "L" + PkgNames::PatchKind() );
-	    header.push_back( "L" + PkgNames::PkgSummary() );
-	    header.push_back( "L" + PkgNames::PkgSize() );
+	    // header.push_back( "L" + PkgNames::PkgSummary() );
+	    // header.push_back( "L" + PkgNames::PkgSize() );
 	    break;
 	}
 	case T_Selections: {
@@ -730,12 +730,14 @@ bool NCPkgTable::createPatchEntry ( ZyppPatch patchPtr, ZyppSel	selectable )
 	NCERR << "No valid patch available" << endl;
 	return false;
     }
-
-    pkgLine.push_back( selectable->name() );	// name
+    if ( !patchPtr->summary().empty() )
+	pkgLine.push_back( patchPtr->summary() );  	// short description
+    else
+	pkgLine.push_back( selectable->name() );	// name	
     pkgLine.push_back( patchPtr->category() );  // patch kind
-    pkgLine.push_back( patchPtr->summary() );  	// short description
-    zypp::ByteCount size = patchPtr->size(); 	// installed size
-    pkgLine.push_back( size.asString( 8 ) );
+
+    // zypp::ByteCount size = patchPtr->size();
+    // pkgLine.push_back( size.asString( 8 ) );
 
 
     addLine( selectable->status(), //  get the status

diff --git a/src/PackageSelector.cc b/src/PackageSelector.cc
@@ -2098,8 +2098,9 @@ bool PackageSelector::showPatchInformation ( ZyppObj objPtr, ZyppSel selectable
 	descr += PkgNames::Patch();
 	descr += selectable->name();
 	descr += "&nbsp;";
-	descr += PkgNames::Size();
-	descr += patchPtr->size().asString( 8 );
+	// the patch size is not available
+        // descr += PkgNames::Size();
+	// descr += patchPtr->size().asString( 8 );
 	descr += "<br>";
 	// get and format the patch description
 	zypp::Text value = patchPtr->description();