| -rw-r--r-- | noncore/settings/packagemanager/ChangeLog | 7 | ||||
| -rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 12 | ||||
| -rw-r--r-- | noncore/settings/packagemanager/opackagemanager.cpp | 7 |
3 files changed, 16 insertions, 10 deletions
diff --git a/noncore/settings/packagemanager/ChangeLog b/noncore/settings/packagemanager/ChangeLog index 608cd98..38756b1 100644 --- a/noncore/settings/packagemanager/ChangeLog +++ b/noncore/settings/packagemanager/ChangeLog @@ -1 +1,6 @@ +2005-02-16 Dan Williams <drw@handhelds.org> + + * Fixed stupid bug where last package in status file was not shown as installed when it should be + * Removed printf's + 2005-01-02 Dan Williams <drw@handhelds.org> @@ -6,3 +11,3 @@ * Many small code tweaks - + 2004-12-21 Dan Williams <drw@handhelds.org> 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 @@ -365,2 +365,6 @@ OPackageList *OIpkg::installedPackages( const QString &destName, const QString & + // 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; @@ -455,3 +459,3 @@ bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶me OConfItemList *destList = destinations(); - + for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) @@ -647,3 +651,3 @@ void OIpkg::linkPackageDir( const QString &dest ) OConfItem *destConfItem = findConfItem( OConfItem::Destination, dest ); - + emit signalIpkgMessage( tr( "Linking packages installed in: %1" ).arg( dest ) ); @@ -691,3 +695,3 @@ void OIpkg::linkPackageDir( const QString &dest ) linkFile = fileInfo.readLink(); - + // See if directory exists in 'root', if not, create @@ -735,3 +739,3 @@ void OIpkg::unlinkPackage( const QString &package, OConfItemList *destList ) //emit signalIpkgMessage( QString( "Looking for '%1'" ).arg ( destInfoFileName ) ); - + // If found and destination is not 'root', remove symbolic links diff --git a/noncore/settings/packagemanager/opackagemanager.cpp b/noncore/settings/packagemanager/opackagemanager.cpp index ac16954..c9fdec1 100644 --- a/noncore/settings/packagemanager/opackagemanager.cpp +++ b/noncore/settings/packagemanager/opackagemanager.cpp @@ -85,6 +85,5 @@ void OPackageManager::loadAvailablePackages() // Load package info - if ( !m_packages.find( package->name() ) ) { - printf( "ADD AVAILABLE '%s'\n", package->name().latin1()); + if ( !m_packages.find( package->name() ) ) m_packages.insert( package->name(), package ); - } else + else { @@ -141,3 +140,2 @@ void OPackageManager::loadInstalledPackages() - printf( "DESGTINATION %s\n", destination->name().latin1()); OPackageList *packageList = m_ipkg.installedPackages( destination->name(), @@ -161,3 +159,2 @@ void OPackageManager::loadInstalledPackages() // Package isn't in a current feed, add to list - printf( "ADD INSTALLED '%s'\n", package->name().latin1()); m_packages.insert( package->name(), package ); |