author | andyq <andyq> | 2002-10-17 22:52:44 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-10-17 22:52:44 (UTC) |
commit | e38ea35a5bbfae58a9d4cb66cfdf557d606921cd (patch) (unidiff) | |
tree | 4526e3e7a8540bbc81baa25c629bfda2f76e56bd | |
parent | b61a21e46590228b6c5800d168fc57789ce733f6 (diff) | |
download | opie-e38ea35a5bbfae58a9d4cb66cfdf557d606921cd.zip opie-e38ea35a5bbfae58a9d4cb66cfdf557d606921cd.tar.gz opie-e38ea35a5bbfae58a9d4cb66cfdf557d606921cd.tar.bz2 |
Now sets the destination a package was installed to
-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 ) | |||
80 | packageFile = path + "usr/lib/ipkg/status"; | 80 | packageFile = path + "usr/lib/ipkg/status"; |
81 | readPackageFile( 0, false, installingToRoot ); | 81 | readPackageFile( 0, false, installingToRoot, dit ); |
82 | } | 82 | } |
@@ -141,3 +141,3 @@ void Server :: readLocalIpks( Server *local ) | |||
141 | 141 | ||
142 | void Server :: readPackageFile( Server *local, bool clearAll, bool installingToRoot ) | 142 | void Server :: readPackageFile( Server *local, bool clearAll, bool installingToRoot, Destination *dest ) |
143 | { | 143 | { |
@@ -170,3 +170,4 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR | |||
170 | value = v; | 170 | value = v; |
171 | key.stripWhiteSpace(); | 171 | key = key.stripWhiteSpace(); |
172 | value = value.stripWhiteSpace(); | ||
172 | if ( key == "Package" && newPackage ) | 173 | if ( key == "Package" && newPackage ) |
@@ -180,2 +181,3 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR | |||
180 | currPackage = &(packageList.back()); | 181 | currPackage = &(packageList.back()); |
182 | currPackage->setInstalledTo( dest ); | ||
181 | 183 | ||
@@ -184,2 +186,7 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR | |||
184 | } | 186 | } |
187 | else | ||
188 | { | ||
189 | if (currPackage->getStatus().find( "deinstall" ) != -1 ) | ||
190 | currPackage->setInstalledTo( dest ); | ||
191 | } | ||
185 | } | 192 | } |
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: | |||
39 | void readLocalIpks( Server *local ); | 39 | void readLocalIpks( Server *local ); |
40 | void readPackageFile( Server *local = 0, bool clearAll = true, bool installedToRoot= false ); | 40 | void readPackageFile( Server *local = 0, bool clearAll = true, bool installedToRoot= false, Destination *dest = 0 ); |
41 | void buildLocalPackages( Server *local ); | 41 | void buildLocalPackages( Server *local ); |
@@ -61,3 +61,2 @@ private: | |||
61 | 61 | ||
62 | |||
63 | vector<Package> packageList; | 62 | vector<Package> packageList; |