Diffstat (limited to 'noncore/settings/aqpkg/server.cpp') (more/less context) (show 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 | |||
@@ -69,25 +69,25 @@ void Server :: readStatusFile( vector<Destination> &destList ) | |||
69 | 69 | ||
70 | QString path = dit->getDestinationPath(); | 70 | QString path = dit->getDestinationPath(); |
71 | if ( path.right( 1 ) != "/" ) | 71 | if ( path.right( 1 ) != "/" ) |
72 | path += "/"; | 72 | path += "/"; |
73 | 73 | ||
74 | if ( path == "/" ) | 74 | if ( path == "/" ) |
75 | { | 75 | { |
76 | rootRead = true; | 76 | rootRead = true; |
77 | installingToRoot = true; | 77 | installingToRoot = true; |
78 | } | 78 | } |
79 | 79 | ||
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 | } |
83 | 83 | ||
84 | // Ensure that the root status file is read | 84 | // Ensure that the root status file is read |
85 | if ( !rootRead ) | 85 | if ( !rootRead ) |
86 | { | 86 | { |
87 | cout << "Reading status file " << "/usr/lib/ipkg/status" << endl; | 87 | cout << "Reading status file " << "/usr/lib/ipkg/status" << endl; |
88 | packageFile = "/usr/lib/ipkg/status"; | 88 | packageFile = "/usr/lib/ipkg/status"; |
89 | readPackageFile( 0, false, true ); | 89 | readPackageFile( 0, false, true ); |
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
93 | void Server :: readLocalIpks( Server *local ) | 93 | void Server :: readLocalIpks( Server *local ) |
@@ -130,25 +130,25 @@ void Server :: readLocalIpks( Server *local ) | |||
130 | packageList.push_back( Package( tmp ) ); | 130 | packageList.push_back( Package( tmp ) ); |
131 | int p2 = file.find( "_", p+1 ); | 131 | int p2 = file.find( "_", p+1 ); |
132 | tmp = file.mid( p+1, p2-(p+1) ); | 132 | tmp = file.mid( p+1, p2-(p+1) ); |
133 | packageList.back().setVersion( tmp ); | 133 | packageList.back().setVersion( tmp ); |
134 | packageList.back().setPackageStoredLocally( true ); | 134 | packageList.back().setPackageStoredLocally( true ); |
135 | } | 135 | } |
136 | #endif | 136 | #endif |
137 | 137 | ||
138 | // build local packages | 138 | // build local packages |
139 | buildLocalPackages( local ); | 139 | buildLocalPackages( local ); |
140 | } | 140 | } |
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 | { |
144 | ifstream in( packageFile ); | 144 | ifstream in( packageFile ); |
145 | if ( !in.is_open() ) | 145 | if ( !in.is_open() ) |
146 | return; | 146 | return; |
147 | 147 | ||
148 | char line[1001]; | 148 | char line[1001]; |
149 | char k[21]; | 149 | char k[21]; |
150 | char v[1001]; | 150 | char v[1001]; |
151 | QString key; | 151 | QString key; |
152 | QString value; | 152 | QString value; |
153 | 153 | ||
154 | if ( clearAll ) | 154 | if ( clearAll ) |
@@ -159,38 +159,45 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR | |||
159 | do | 159 | do |
160 | { | 160 | { |
161 | in.getline( line, 1000 ); | 161 | in.getline( line, 1000 ); |
162 | if ( in.eof() ) | 162 | if ( in.eof() ) |
163 | continue; | 163 | continue; |
164 | 164 | ||
165 | k[0] = '\0'; | 165 | k[0] = '\0'; |
166 | v[0] = '\0'; | 166 | v[0] = '\0'; |
167 | 167 | ||
168 | sscanf( line, "%[^:]: %[^\n]", k, v ); | 168 | sscanf( line, "%[^:]: %[^\n]", k, v ); |
169 | key = k; | 169 | key = k; |
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 ) |
173 | { | 174 | { |
174 | newPackage = false; | 175 | newPackage = false; |
175 | 176 | ||
176 | currPackage = getPackage( value ); | 177 | currPackage = getPackage( value ); |
177 | if ( !currPackage ) | 178 | if ( !currPackage ) |
178 | { | 179 | { |
179 | packageList.push_back( Package( value ) ); | 180 | packageList.push_back( Package( value ) ); |
180 | currPackage = &(packageList.back()); | 181 | currPackage = &(packageList.back()); |
182 | currPackage->setInstalledTo( dest ); | ||
181 | 183 | ||
182 | if ( installingToRoot ) | 184 | if ( installingToRoot ) |
183 | currPackage->setInstalledToRoot( true ); | 185 | currPackage->setInstalledToRoot( true ); |
184 | } | 186 | } |
187 | else | ||
188 | { | ||
189 | if (currPackage->getStatus().find( "deinstall" ) != -1 ) | ||
190 | currPackage->setInstalledTo( dest ); | ||
191 | } | ||
185 | } | 192 | } |
186 | else if ( key == "Version" ) | 193 | else if ( key == "Version" ) |
187 | { | 194 | { |
188 | if ( currPackage ) | 195 | if ( currPackage ) |
189 | currPackage->setVersion( value ); | 196 | currPackage->setVersion( value ); |
190 | } | 197 | } |
191 | else if ( key == "Status" ) | 198 | else if ( key == "Status" ) |
192 | { | 199 | { |
193 | if ( currPackage ) | 200 | if ( currPackage ) |
194 | currPackage->setStatus( value ); | 201 | currPackage->setStatus( value ); |
195 | } | 202 | } |
196 | else if ( key == "Description" ) | 203 | else if ( key == "Description" ) |