From 4556ab6dffdaf9108899a7a1f74d83f54ac4e91a Mon Sep 17 00:00:00 2001 From: drw Date: Wed, 16 Feb 2005 17:22:19 +0000 Subject: Fixed stupid bug where last package in status file was not shown as installed when it should be, and removed some printfs --- (limited to 'noncore/settings/packagemanager/oipkg.cpp') diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp index f2d7e39..e7e292e 100644 --- a/noncore/settings/packagemanager/oipkg.cpp +++ b/noncore/settings/packagemanager/oipkg.cpp @@ -363,6 +363,10 @@ OPackageList *OIpkg::installedPackages( const QString &destName, const QString & f.close(); + // Make sure to add to list last entry + if ( !name.isNull() && status.contains( " installed" ) ) + pl->append( new OPackage( name, QString::null, version, QString::null, destName ) ); + return pl; } @@ -453,7 +457,7 @@ bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶me // Get list of destinations for unlinking of packages not installed to root OConfItemList *destList = destinations(); - + for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) { unlinkPackage( (*it), destList ); @@ -645,7 +649,7 @@ void OIpkg::linkPackageDir( const QString &dest ) if ( !dest.isNull() ) { OConfItem *destConfItem = findConfItem( OConfItem::Destination, dest ); - + emit signalIpkgMessage( tr( "Linking packages installed in: %1" ).arg( dest ) ); // Set package destination directory @@ -689,7 +693,7 @@ void OIpkg::linkPackageDir( const QString &dest ) QFileInfo fileInfo( linkFile ); if ( fileInfo.isSymLink() && !fileInfo.readLink().isEmpty() ) linkFile = fileInfo.readLink(); - + // See if directory exists in 'root', if not, create fileInfo.setFile( linkDest ); QString linkDestDirName = fileInfo.dirPath( true ); @@ -733,7 +737,7 @@ void OIpkg::unlinkPackage( const QString &package, OConfItemList *destList ) .arg( IPKG_INFO_PATH ) .arg( package ); //emit signalIpkgMessage( QString( "Looking for '%1'" ).arg ( destInfoFileName ) ); - + // If found and destination is not 'root', remove symbolic links if ( QFile::exists( destInfoFileName ) && dest->name() != "root" ) { -- cgit v0.9.0.2