summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/aqpkg/networkpkgmgr.cpp8
-rw-r--r--noncore/settings/aqpkg/package.cpp15
-rw-r--r--noncore/settings/aqpkg/package.h1
-rw-r--r--noncore/settings/aqpkg/server.cpp0
4 files changed, 23 insertions, 1 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 )
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
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
@@ -26,4 +26,6 @@ Package::Package( QString &name )
26 packageStoredLocally = false; 26 packageStoredLocally = false;
27 installedToRoot = false; 27 installedToRoot = false;
28 installed = false;
29 installedTo = 0;
28} 30}
29 31
@@ -32,4 +34,9 @@ Package::Package( char *name )
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
@@ -104,4 +111,12 @@ QString Package :: getInstalledVersion()
104} 111}
105 112
113QString Package :: getInstalledPackageName()
114{
115 if ( localPackage )
116 return localPackage->getPackageName();
117 else
118 return getPackageName();
119}
120
106bool Package :: isInstalled() 121bool Package :: isInstalled()
107{ 122{
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:
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
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