author | andyq <andyq> | 2002-11-02 13:52:55 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-11-02 13:52:55 (UTC) |
commit | cf34849ac5c3eb9d16929cc88834973910209f74 (patch) (unidiff) | |
tree | 06e189f927f88baeb16c927317153e1805a5f614 /noncore/settings/aqpkg/server.cpp | |
parent | d21d693d91af8ee8fb54478a6db67f5a0590a767 (diff) | |
download | opie-cf34849ac5c3eb9d16929cc88834973910209f74.zip opie-cf34849ac5c3eb9d16929cc88834973910209f74.tar.gz opie-cf34849ac5c3eb9d16929cc88834973910209f74.tar.bz2 |
Handles upgrading of local ipk files better and the Local-IPKG view displays
the name of the file rather thanthe package name (so version can easily be seen)
Diffstat (limited to 'noncore/settings/aqpkg/server.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/server.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp index 8bca892..539ebf0 100644 --- a/noncore/settings/aqpkg/server.cpp +++ b/noncore/settings/aqpkg/server.cpp | |||
@@ -110,7 +110,8 @@ void Server :: readLocalIpks( Server *local ) | |||
110 | // for these are packagename_version_arm.ipk | 110 | // for these are packagename_version_arm.ipk |
111 | QString file = (*it)->file(); | 111 | QString file = (*it)->file(); |
112 | 112 | ||
113 | QString packageName = Utils::getPackageNameFromIpkFilename( file ); | 113 | // Changed to display the filename (excluding the path) |
114 | QString packageName = Utils::getFilenameFromIpkFilename( file ); | ||
114 | QString ver = Utils::getPackageVersionFromIpkFilename( file ); | 115 | QString ver = Utils::getPackageVersionFromIpkFilename( file ); |
115 | packageList.push_back( Package( packageName ) ); | 116 | packageList.push_back( Package( packageName ) ); |
116 | packageList.back().setVersion( ver ); | 117 | packageList.back().setVersion( ver ); |
@@ -227,6 +228,11 @@ void Server :: buildLocalPackages( Server *local ) | |||
227 | for ( unsigned int i = 0 ; i < packageList.size() ; ++i ) | 228 | for ( unsigned int i = 0 ; i < packageList.size() ; ++i ) |
228 | { | 229 | { |
229 | QString name = packageList[i].getPackageName(); | 230 | QString name = packageList[i].getPackageName(); |
231 | |||
232 | // If the package name is an ipk name, then convert the filename to a package name | ||
233 | if ( name.find( ".ipk" ) != -1 ) | ||
234 | name = Utils::getPackageNameFromIpkFilename( packageList[i].getFilename() ); | ||
235 | |||
230 | if ( local ) | 236 | if ( local ) |
231 | packageList[i].setLocalPackage( local->getPackage( name ) ); | 237 | packageList[i].setLocalPackage( local->getPackage( name ) ); |
232 | else | 238 | else |