-rw-r--r-- | noncore/settings/packagemanager/ChangeLog | 5 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/packagemanager/opackagemanager.cpp | 7 |
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 +1,6 @@ | |||
1 | 2005-02-16 Dan Williams <drw@handhelds.org> | ||
2 | |||
3 | * Fixed stupid bug where last package in status file was not shown as installed when it should be | ||
4 | * Removed printf's | ||
5 | |||
1 | 2005-01-02 Dan Williams <drw@handhelds.org> | 6 | 2005-01-02 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 & | |||
365 | 365 | ||
366 | // Make sure to add to list last entry | ||
367 | if ( !name.isNull() && status.contains( " installed" ) ) | ||
368 | pl->append( new OPackage( name, QString::null, version, QString::null, destName ) ); | ||
369 | |||
366 | return pl; | 370 | 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 | |||
@@ -85,6 +85,5 @@ void OPackageManager::loadAvailablePackages() | |||
85 | // Load package info | 85 | // Load package info |
86 | if ( !m_packages.find( package->name() ) ) { | 86 | if ( !m_packages.find( package->name() ) ) |
87 | printf( "ADD AVAILABLE '%s'\n", package->name().latin1()); | ||
88 | m_packages.insert( package->name(), package ); | 87 | m_packages.insert( package->name(), package ); |
89 | } else | 88 | else |
90 | { | 89 | { |
@@ -141,3 +140,2 @@ void OPackageManager::loadInstalledPackages() | |||
141 | 140 | ||
142 | printf( "DESGTINATION %s\n", destination->name().latin1()); | ||
143 | OPackageList *packageList = m_ipkg.installedPackages( destination->name(), | 141 | OPackageList *packageList = m_ipkg.installedPackages( destination->name(), |
@@ -161,3 +159,2 @@ void OPackageManager::loadInstalledPackages() | |||
161 | // Package isn't in a current feed, add to list | 159 | // Package isn't in a current feed, add to list |
162 | printf( "ADD INSTALLED '%s'\n", package->name().latin1()); | ||
163 | m_packages.insert( package->name(), package ); | 160 | m_packages.insert( package->name(), package ); |