Handle mixed multiversion packages (fate#318778)

libyui · Aug 12, 2015 · 6da3472 · 6da3472
1 parent c086c8d
commit 6da3472
Show file tree

Hide file tree

Showing 4 changed files with 331 additions and 102 deletions.
diff --git a/src/YQPackageSelector.cc b/src/YQPackageSelector.cc
@@ -492,8 +492,11 @@ YQPackageSelector::layoutPkgList( QWidget *parent )
     // which repository upgrade job to add or remove, for that
     // we will encode the links as repoupgradeadd://alias and
     // repoupgraderemove:://alias
-    connect(_repoUpgradeLabel, SIGNAL(linkActivated(const QString &)), this, SLOT(slotRepoUpgradeLabelLinkClicked(const QString &)));
-    connect(_repoUpgradingLabel, SIGNAL(linkActivated(const QString &)), this, SLOT(slotRepoUpgradeLabelLinkClicked(const QString &)));
+    connect( _repoUpgradeLabel, SIGNAL( linkActivated                  ( QString ) ),
+	    this,               SLOT(   slotRepoUpgradeLabelLinkClicked( QString ) ) );
+
+    connect(_repoUpgradingLabel, SIGNAL( linkActivated( QString ) ),
+	    this,                SLOT(   slotRepoUpgradeLabelLinkClicked( QString ) ) );
 
     updateRepositoryUpgradeLabel();
 
@@ -558,8 +561,7 @@ YQPackageSelector::layoutDetailsViews( QWidget *parent )
     // Versions
     //
 
-    _pkgVersionsView = new YQPkgVersionsView( _detailsViews,
-					      true );	// userCanSwitchVersions
+    _pkgVersionsView = new YQPkgVersionsView( _detailsViews );
     YUI_CHECK_NEW( _pkgVersionsView );
 
     _detailsViews->addTab( _pkgVersionsView, _( "&Versions" ) );
@@ -568,7 +570,7 @@ YQPackageSelector::layoutDetailsViews( QWidget *parent )
 	     _pkgVersionsView,	SLOT  ( showDetailsIfVisible( ZyppSel ) ) );
 
     connect( _pkgList,          SIGNAL( statusChanged() ),
-             _pkgVersionsView,  SLOT  ( slotRefreshDetails() ) );
+             _pkgVersionsView,  SIGNAL( statusChanged() ) );
 
 
     //
@@ -1046,7 +1048,7 @@ YQPackageSelector::makeConnections()
 	connect( _pkgVersionsView,	SIGNAL( candidateChanged( ZyppObj ) ),
 		 _pkgList,		SLOT  ( updateItemData()    ) );
 
-	connect( _pkgVersionsView,	SIGNAL( multiversionSelectionChanged( ) ),
+	connect( _pkgVersionsView,	SIGNAL( statusChanged()  ),
 		 _pkgList,		SLOT  ( updateItemData() ) );
     }
 

diff --git a/src/YQPkgTechnicalDetailsView.cc b/src/YQPkgTechnicalDetailsView.cc
@@ -155,7 +155,7 @@ YQPkgTechnicalDetailsView::simpleTable( ZyppSel selectable,
     html += row( hcell( _( "Build Time:"	) ) + cell( pkg->buildtime()			) );
 
     html +=
-	pkg == selectable->installedObj() ?
+	*pkg == selectable->installedObj() ?
 	row( hcell( _( "Install Time:" ) ) + cell( pkg->installtime() ) ) : "";
 
     html += row( hcell( _( "Package Group:"	) ) + cell( formatRpmGroup( pkg )		) );