| author | drw <drw> | 2003-04-20 23:58:21 (UTC) |
|---|---|---|
| committer | drw <drw> | 2003-04-20 23:58:21 (UTC) |
| commit | 9163bfcc25b78477a75a153f2a75be30ad297c6a (patch) (unidiff) | |
| tree | 668e10a9bb0ca7937e3f630a62d3afbbbbf06438 | |
| parent | 6b78c023f67433b8f38d9e77598b8530988bfec8 (diff) | |
| download | opie-9163bfcc25b78477a75a153f2a75be30ad297c6a.zip opie-9163bfcc25b78477a75a153f2a75be30ad297c6a.tar.gz opie-9163bfcc25b78477a75a153f2a75be30ad297c6a.tar.bz2 | |
Finally fixed it so that packages are not incorrectly marked as having an update available
| -rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 6 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/package.cpp | 5 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/package.h | 19 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/server.cpp | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 6ea619c..fb40d52 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
| @@ -640,6 +640,5 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) | |||
| 640 | if ( showUpgradedPkgs ) | 640 | if ( showUpgradedPkgs ) |
| 641 | { | 641 | { |
| 642 | if ( !package->isInstalled() || | 642 | if ( !package->isInstalled() || !package->getNewVersionAvailable() ) |
| 643 | compareVersions( package->getInstalledVersion(), package->getVersion() ) != 1 ) | ||
| 644 | continue; | 643 | continue; |
| 645 | } | 644 | } |
| @@ -664,6 +663,5 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) | |||
| 664 | // If a different version of package is available, show update available icon | 663 | // If a different version of package is available, show update available icon |
| 665 | // Otherwise, show installed icon | 664 | // Otherwise, show installed icon |
| 666 | if ( package->getVersion() != package->getInstalledVersion() && | 665 | if ( package->getNewVersionAvailable()) |
| 667 | compareVersions( package->getInstalledVersion(), package->getVersion() ) == 1) | ||
| 668 | { | 666 | { |
| 669 | 667 | ||
diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp index 83e0706..3395870 100644 --- a/noncore/settings/aqpkg/package.cpp +++ b/noncore/settings/aqpkg/package.cpp | |||
| @@ -51,4 +51,5 @@ Package::Package( char *name ) | |||
| 51 | installed = false; | 51 | installed = false; |
| 52 | installedTo = 0; | 52 | installedTo = 0; |
| 53 | differentVersionAvailable = false; | ||
| 53 | } | 54 | } |
| 54 | 55 | ||
| @@ -90,5 +91,5 @@ void Package :: setLocalPackage( Package *p ) | |||
| 90 | 91 | ||
| 91 | if ( localPackage ) | 92 | if ( localPackage ) |
| 92 | if ( localPackage->getVersion() != getVersion() ) | 93 | if ( localPackage->getVersion() < getVersion() && !installed ) |
| 93 | differentVersionAvailable = true; | 94 | differentVersionAvailable = true; |
| 94 | else | 95 | else |
| @@ -101,5 +102,5 @@ void Package :: setVersion( const QString &v ) | |||
| 101 | 102 | ||
| 102 | if ( localPackage ) | 103 | if ( localPackage ) |
| 103 | if ( localPackage->getVersion() != getVersion() ) | 104 | if ( localPackage->getVersion() < getVersion() && !installed ) |
| 104 | differentVersionAvailable = true; | 105 | differentVersionAvailable = true; |
| 105 | else | 106 | else |
diff --git a/noncore/settings/aqpkg/package.h b/noncore/settings/aqpkg/package.h index f5a132f..110ae91 100644 --- a/noncore/settings/aqpkg/package.h +++ b/noncore/settings/aqpkg/package.h | |||
| @@ -48,13 +48,14 @@ public: | |||
| 48 | void setSection( const QString §) { section = sect; } | 48 | void setSection( const QString §) { section = sect; } |
| 49 | 49 | ||
| 50 | Package *getLocalPackage() { return localPackage; } | 50 | Package *getLocalPackage() { return localPackage; } |
| 51 | QString getPackageName() { return packageName; } | 51 | QString getPackageName() { return packageName; } |
| 52 | QString getVersion() { return version; } | 52 | QString getVersion() { return version; } |
| 53 | QString getStatus() { return status; } | 53 | QString getStatus() { return status; } |
| 54 | QString getDescription() { return description; } | 54 | QString getDescription() { return description; } |
| 55 | QString getFilename() { return filename; } | 55 | QString getFilename() { return filename; } |
| 56 | QString getDependancies() { return dependancies; } | 56 | QString getDependancies() { return dependancies; } |
| 57 | QString getPackageSize() { return packageSize; } | 57 | QString getPackageSize() { return packageSize; } |
| 58 | QString getSection() { return section; } | 58 | QString getSection() { return section; } |
| 59 | bool getNewVersionAvailable() { return differentVersionAvailable; } | ||
| 59 | 60 | ||
| 60 | bool isInstalled(); | 61 | bool isInstalled(); |
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp index 9a239a5..e2b8096 100644 --- a/noncore/settings/aqpkg/server.cpp +++ b/noncore/settings/aqpkg/server.cpp | |||
| @@ -185,5 +185,5 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR | |||
| 185 | else | 185 | else |
| 186 | { | 186 | { |
| 187 | if (currPackage->getStatus().find( "deinstall" ) != -1 ) | 187 | if ( currPackage->isInstalled() ) |
| 188 | currPackage->setInstalledTo( dest ); | 188 | currPackage->setInstalledTo( dest ); |
| 189 | } | 189 | } |