| -rw-r--r-- | noncore/settings/aqpkg/server.cpp | 13 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/server.h | 3 |
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 @@ -80,3 +80,3 @@ void Server :: readStatusFile( vector<Destination> &destList ) packageFile = path + "usr/lib/ipkg/status"; - readPackageFile( 0, false, installingToRoot ); + readPackageFile( 0, false, installingToRoot, dit ); } @@ -141,3 +141,3 @@ void Server :: readLocalIpks( Server *local ) -void Server :: readPackageFile( Server *local, bool clearAll, bool installingToRoot ) +void Server :: readPackageFile( Server *local, bool clearAll, bool installingToRoot, Destination *dest ) { @@ -170,3 +170,4 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR value = v; - key.stripWhiteSpace(); + key = key.stripWhiteSpace(); + value = value.stripWhiteSpace(); if ( key == "Package" && newPackage ) @@ -180,2 +181,3 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR currPackage = &(packageList.back()); + currPackage->setInstalledTo( dest ); @@ -184,2 +186,7 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR } + else + { + if (currPackage->getStatus().find( "deinstall" ) != -1 ) + currPackage->setInstalledTo( dest ); + } } 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 @@ -39,3 +39,3 @@ public: 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 ); @@ -61,3 +61,2 @@ private: - vector<Package> packageList; |