summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/packagemanager/ChangeLog5
-rw-r--r--noncore/settings/packagemanager/oipkg.cpp4
-rw-r--r--noncore/settings/packagemanager/opackagemanager.cpp7
3 files changed, 11 insertions, 5 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,3 +1,8 @@
+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>
* Released version 0.6.1
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;
}
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
@@ -83,10 +83,9 @@ void OPackageManager::loadAvailablePackages()
OPackage *package = packageIt.current();
// 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
{
// If new package is newer version, replace existing package
OPackage *currPackage = m_packages[package->name()];
@@ -139,7 +138,6 @@ void OPackageManager::loadInstalledPackages()
emit statusBar( destCount );
qApp->processEvents();
- printf( "DESGTINATION %s\n", destination->name().latin1());
OPackageList *packageList = m_ipkg.installedPackages( destination->name(),
destination->value() );
if ( packageList )
@@ -159,7 +157,6 @@ void OPackageManager::loadInstalledPackages()
else
{
// Package isn't in a current feed, add to list
- printf( "ADD INSTALLED '%s'\n", package->name().latin1());
m_packages.insert( package->name(), package );
// Add category to list if it doesn't already exist