Now sets the destination a package was installed to

2 files changed, 11 insertions, 5 deletions

diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 0069a60..7d103a2 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -75,13 +75,13 @@ void Server :: readStatusFile(  vector<Destination> &destList )
         {
             rootRead = true;
             installingToRoot = true;
         }   
         
         packageFile = path + "usr/lib/ipkg/status";
-        readPackageFile( 0, false, installingToRoot );
+        readPackageFile( 0, false, installingToRoot, dit );
     }
 
     // Ensure that the root status file is read
     if ( !rootRead )
     {
         cout << "Reading status file " << "/usr/lib/ipkg/status" << endl;
@@ -136,13 +136,13 @@ void Server :: readLocalIpks( Server *local )
 #endif
 
     // build local packages
     buildLocalPackages( local );
 }
 
-void Server :: readPackageFile( Server *local, bool clearAll, bool installingToRoot )
+void Server :: readPackageFile( Server *local, bool clearAll, bool installingToRoot, Destination *dest )
 {
     ifstream in( packageFile );
 	if ( !in.is_open() )
         return;
 
     char line[1001];
@@ -165,26 +165,33 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR
         k[0] = '\0';
         v[0] = '\0';
 
         sscanf( line, "%[^:]: %[^\n]", k, v );
         key = k;
         value = v;
-        key.stripWhiteSpace();
+        key = key.stripWhiteSpace();
+        value = value.stripWhiteSpace();
         if ( key == "Package" && newPackage )
         {
             newPackage = false;
 
             currPackage = getPackage( value );
             if ( !currPackage )
             {
     			packageList.push_back( Package( value ) );
 	    		currPackage = &(packageList.back());
+                currPackage->setInstalledTo( dest );
 
                 if ( installingToRoot )
                     currPackage->setInstalledToRoot( true );
             }
+            else
+            {
+                if (currPackage->getStatus().find( "deinstall" ) != -1 )
+                    currPackage->setInstalledTo( dest );
+            }
         }
         else if ( key == "Version" )
         {
             if ( currPackage )
                 currPackage->setVersion( value );
         }
diff --git a/noncore/settings/aqpkg/server.h b/noncore/settings/aqpkg/server.h
index 5f83f75..e9f434c 100644
--- a/noncore/settings/aqpkg/server.h
+++ b/noncore/settings/aqpkg/server.h
@@ -34,13 +34,13 @@ public:
     ~Server();
 
     void cleanUp();
 
     void readStatusFile( vector<Destination> &v );
     void readLocalIpks( Server *local );
-    void readPackageFile( Server *local = 0, bool clearAll = true, bool installedToRoot= false );
+    void readPackageFile( Server *local = 0, bool clearAll = true, bool installedToRoot= false, Destination *dest = 0 );
     void buildLocalPackages( Server *local );
     Package *getPackage( const char *name );
     Package *getPackage( QString &name );
     QString toString();
     vector<Package> &getPackageList();
     bool isServerActive() { return active; }
@@ -56,11 +56,10 @@ protected:
 private:
   QString serverName;
   QString serverUrl;
   QString packageFile;
   bool active;
 
-
   vector<Package> packageList;
 };
 
 #endif