Diffstat (limited to 'noncore/settings/aqpkg/server.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/server.cpp | 13 |
1 files changed, 10 insertions, 3 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 ); + } } |