author | drw <drw> | 2005-02-16 17:22:19 (UTC) |
---|---|---|
committer | drw <drw> | 2005-02-16 17:22:19 (UTC) |
commit | 4556ab6dffdaf9108899a7a1f74d83f54ac4e91a (patch) (side-by-side diff) | |
tree | 70fe735502f0a31d7193621c482b9fafb6bbe006 /noncore/settings/packagemanager | |
parent | 7dd436c9a45c1fbd5d57f97bc786d0badc0ef5e5 (diff) | |
download | opie-4556ab6dffdaf9108899a7a1f74d83f54ac4e91a.zip opie-4556ab6dffdaf9108899a7a1f74d83f54ac4e91a.tar.gz opie-4556ab6dffdaf9108899a7a1f74d83f54ac4e91a.tar.bz2 |
Fixed stupid bug where last package in status file was not shown as installed when it should be, and removed some printfs
Diffstat (limited to 'noncore/settings/packagemanager') (more/less context) (show whitespace changes)
-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,4 +1,9 @@ +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 * Implemented native package linking code to remove need for ipkg-link 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 @@ -362,8 +362,12 @@ 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; } OConfItem *OIpkg::findConfItem( OConfItem::Type type, const QString &name ) 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 @@ -82,12 +82,11 @@ 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()]; if ( compareVersions( package->version(), currPackage->version() ) == 1 ) @@ -138,9 +137,8 @@ void OPackageManager::loadInstalledPackages() ++destCount; emit statusBar( destCount ); qApp->processEvents(); - printf( "DESGTINATION %s\n", destination->name().latin1()); OPackageList *packageList = m_ipkg.installedPackages( destination->name(), destination->value() ); if ( packageList ) { @@ -158,9 +156,8 @@ 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 if ( m_categories.grep( package->category() ).isEmpty() ) |