-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 | |||
@@ -484,11 +484,17 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) | |||
484 | { | 484 | { |
485 | InstallData item; | 485 | InstallData item; |
486 | item.option = "D"; | 486 | item.option = "D"; |
487 | item.packageName = name; | 487 | item.packageName = p->getInstalledPackageName(); |
488 | if ( p->getInstalledTo() ) | 488 | if ( p->getInstalledTo() ) |
489 | { | ||
489 | item.destination = p->getInstalledTo(); | 490 | item.destination = p->getInstalledTo(); |
491 | cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl; | ||
492 | cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl; | ||
493 | } | ||
490 | else | 494 | else |
495 | { | ||
491 | item.destination = p->getLocalPackage()->getInstalledTo(); | 496 | item.destination = p->getLocalPackage()->getInstalledTo(); |
497 | } | ||
492 | 498 | ||
493 | // Sticky option not implemented yet, but will eventually allow | 499 | // Sticky option not implemented yet, but will eventually allow |
494 | // the user to say something like 'remove all' | 500 | // the user to say something like 'remove all' |
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 | |||
@@ -23,14 +23,21 @@ Package::Package( QString &name ) | |||
23 | packageName = name; | 23 | packageName = name; |
24 | localPackage = 0; | 24 | localPackage = 0; |
25 | installed = false; | 25 | installed = false; |
26 | packageStoredLocally = false; | 26 | packageStoredLocally = false; |
27 | installedToRoot = false; | 27 | installedToRoot = false; |
28 | installed = false; | ||
29 | installedTo = 0; | ||
28 | } | 30 | } |
29 | 31 | ||
30 | Package::Package( char *name ) | 32 | Package::Package( char *name ) |
31 | { | 33 | { |
32 | packageName = name; | 34 | packageName = name; |
33 | localPackage = 0; | 35 | localPackage = 0; |
36 | installed = false; | ||
37 | packageStoredLocally = false; | ||
38 | installedToRoot = false; | ||
39 | installed = false; | ||
40 | installedTo = 0; | ||
34 | } | 41 | } |
35 | 42 | ||
36 | Package::~Package() | 43 | Package::~Package() |
@@ -103,6 +110,14 @@ QString Package :: getInstalledVersion() | |||
103 | return getVersion(); | 110 | return getVersion(); |
104 | } | 111 | } |
105 | 112 | ||
113 | QString Package :: getInstalledPackageName() | ||
114 | { | ||
115 | if ( localPackage ) | ||
116 | return localPackage->getPackageName(); | ||
117 | else | ||
118 | return getPackageName(); | ||
119 | } | ||
120 | |||
106 | bool Package :: isInstalled() | 121 | bool Package :: isInstalled() |
107 | { | 122 | { |
108 | return installed || ( localPackage && localPackage->isInstalled() ); | 123 | return installed || ( localPackage && localPackage->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 | |||
@@ -55,6 +55,7 @@ public: | |||
55 | bool isPackageStoredLocally(){ return packageStoredLocally; } | 55 | bool isPackageStoredLocally(){ return packageStoredLocally; } |
56 | bool isInstalledToRoot() { return installedToRoot; } | 56 | bool isInstalledToRoot() { return installedToRoot; } |
57 | QString getInstalledVersion(); | 57 | QString getInstalledVersion(); |
58 | QString getInstalledPackageName(); | ||
58 | Destination *getInstalledTo() { return installedTo; } | 59 | Destination *getInstalledTo() { return installedTo; } |
59 | 60 | ||
60 | QString toString(); | 61 | QString toString(); |
@@ -68,7 +69,7 @@ private: | |||
68 | QString status; | 69 | QString status; |
69 | QString description; | 70 | QString description; |
70 | QString filename; | 71 | QString filename; |
71 | bool packageStoredLocally; | 72 | bool packageStoredLocally; |
72 | bool installedToRoot; | 73 | bool installedToRoot; |
73 | bool installed; | 74 | bool installed; |
74 | bool differentVersionAvailable; | 75 | bool differentVersionAvailable; |
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 | |||
@@ -106,16 +106,16 @@ void Server :: readLocalIpks( Server *local ) | |||
106 | 106 | ||
107 | for ( ; it.current() ; ++it ) | 107 | for ( ; it.current() ; ++it ) |
108 | { | 108 | { |
109 | // OK, we have a local IPK file, I think the standard naming conventions | 109 | // OK, we have a local IPK file, I think the standard naming conventions |
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 | QString packageName = Utils::getPackageNameFromIpkFilename( file ); |
114 | QString ver = Utils::getPackageVersionFromIpkFilename( file ); | 114 | QString ver = Utils::getPackageVersionFromIpkFilename( file ); |
115 | packageList.push_back( Package( packageName ) ); | 115 | packageList.push_back( Package( packageName ) ); |
116 | packageList.back().setVersion( ver ); | 116 | packageList.back().setVersion( ver ); |
117 | packageList.back().setFilename( file ); | 117 | packageList.back().setFilename( file ); |
118 | packageList.back().setPackageStoredLocally( true ); | 118 | packageList.back().setPackageStoredLocally( true ); |
119 | 119 | ||
120 | } | 120 | } |
121 | #else | 121 | #else |