author | andyq <andyq> | 2002-10-20 16:48:26 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-10-20 16:48:26 (UTC) |
commit | a24218529668ca387827ed520cea6d1890df7a88 (patch) (side-by-side diff) | |
tree | 0d9b03c671b57e636fe003dbd185922297396b5a /noncore/settings | |
parent | 1f106a8b44ae659f30361588f53354e8f1985974 (diff) | |
download | opie-a24218529668ca387827ed520cea6d1890df7a88.zip opie-a24218529668ca387827ed520cea6d1890df7a88.tar.gz opie-a24218529668ca387827ed520cea6d1890df7a88.tar.bz2 |
fixed bug with removing from local IPKGS folder
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 8 | ||||
-rw-r--r-- | noncore/settings/aqpkg/package.cpp | 17 | ||||
-rw-r--r-- | noncore/settings/aqpkg/package.h | 3 | ||||
-rw-r--r-- | noncore/settings/aqpkg/server.cpp | 12 |
4 files changed, 31 insertions, 9 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index 3aee7bd..d84fb4b 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp @@ -485,9 +485,15 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) InstallData item; item.option = "D"; - item.packageName = name; + item.packageName = p->getInstalledPackageName(); if ( p->getInstalledTo() ) + { item.destination = p->getInstalledTo(); + cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl; + cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl; + } else + { item.destination = p->getLocalPackage()->getInstalledTo(); + } // Sticky option not implemented yet, but will eventually allow diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp index 48b6934..fd75450 100644 --- a/noncore/settings/aqpkg/package.cpp +++ b/noncore/settings/aqpkg/package.cpp @@ -24,6 +24,8 @@ Package::Package( QString &name ) localPackage = 0; installed = false; - packageStoredLocally = false; + packageStoredLocally = false; installedToRoot = false; + installed = false; + installedTo = 0; } @@ -32,4 +34,9 @@ Package::Package( char *name ) packageName = name; localPackage = 0; + installed = false; + packageStoredLocally = false; + installedToRoot = false; + installed = false; + installedTo = 0; } @@ -104,4 +111,12 @@ QString Package :: getInstalledVersion() } +QString Package :: getInstalledPackageName() +{ + if ( localPackage ) + return localPackage->getPackageName(); + else + return getPackageName(); +} + bool Package :: isInstalled() { diff --git a/noncore/settings/aqpkg/package.h b/noncore/settings/aqpkg/package.h index 8ba5a6a..2f2a165 100644 --- a/noncore/settings/aqpkg/package.h +++ b/noncore/settings/aqpkg/package.h @@ -56,4 +56,5 @@ public: bool isInstalledToRoot() { return installedToRoot; } QString getInstalledVersion(); + QString getInstalledPackageName(); Destination *getInstalledTo() { return installedTo; } @@ -69,5 +70,5 @@ private: QString description; QString filename; - bool packageStoredLocally; + bool packageStoredLocally; bool installedToRoot; bool installed; diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp index 7d103a2..8bca892 100644 --- a/noncore/settings/aqpkg/server.cpp +++ b/noncore/settings/aqpkg/server.cpp @@ -107,14 +107,14 @@ void Server :: readLocalIpks( Server *local ) for ( ; it.current() ; ++it ) { - // OK, we have a local IPK file, I think the standard naming conventions - // for these are packagename_version_arm.ipk - QString file = (*it)->file(); + // OK, we have a local IPK file, I think the standard naming conventions + // for these are packagename_version_arm.ipk + QString file = (*it)->file(); QString packageName = Utils::getPackageNameFromIpkFilename( file ); QString ver = Utils::getPackageVersionFromIpkFilename( file ); packageList.push_back( Package( packageName ) ); - packageList.back().setVersion( ver ); - packageList.back().setFilename( file ); - packageList.back().setPackageStoredLocally( true ); + packageList.back().setVersion( ver ); + packageList.back().setFilename( file ); + packageList.back().setPackageStoredLocally( true ); } |