Diffstat (limited to 'noncore/settings/aqpkg/ipkg.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index dd9e78d..c5c6387 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp | |||
@@ -188,49 +188,49 @@ void Ipkg :: removeStatusEntry() | |||
188 | outStatusFile.append( ".tmp" ); | 188 | outStatusFile.append( ".tmp" ); |
189 | 189 | ||
190 | emit outputText( "" ); | 190 | emit outputText( "" ); |
191 | emit outputText( tr("Removing status entry...") ); | 191 | emit outputText( tr("Removing status entry...") ); |
192 | QString tempstr = tr("status file - "); | 192 | QString tempstr = tr("status file - "); |
193 | tempstr.append( statusFile ); | 193 | tempstr.append( statusFile ); |
194 | emit outputText( tempstr ); | 194 | emit outputText( tempstr ); |
195 | tempstr = tr("package - "); | 195 | tempstr = tr("package - "); |
196 | tempstr.append( package ); | 196 | tempstr.append( package ); |
197 | emit outputText( tempstr ); | 197 | emit outputText( tempstr ); |
198 | 198 | ||
199 | QFile readFile( statusFile ); | 199 | QFile readFile( statusFile ); |
200 | QFile writeFile( outStatusFile ); | 200 | QFile writeFile( outStatusFile ); |
201 | 201 | ||
202 | if ( !readFile.open( IO_ReadOnly ) ) | 202 | if ( !readFile.open( IO_ReadOnly ) ) |
203 | { | 203 | { |
204 | tempstr = tr("Couldn't open status file - "); | 204 | tempstr = tr("Couldn't open status file - "); |
205 | tempstr.append( statusFile ); | 205 | tempstr.append( statusFile ); |
206 | emit outputText( tempstr ); | 206 | emit outputText( tempstr ); |
207 | return; | 207 | return; |
208 | } | 208 | } |
209 | 209 | ||
210 | if ( !writeFile.open( IO_WriteOnly ) ) | 210 | if ( !writeFile.open( IO_WriteOnly ) ) |
211 | { | 211 | { |
212 | tempstr = tr("Couldn't create tempory status file - "); | 212 | tempstr = tr("Couldn't create temporary status file - "); |
213 | tempstr.append( outStatusFile ); | 213 | tempstr.append( outStatusFile ); |
214 | emit outputText( tempstr ); | 214 | emit outputText( tempstr ); |
215 | return; | 215 | return; |
216 | } | 216 | } |
217 | 217 | ||
218 | int i = 0; | 218 | int i = 0; |
219 | 219 | ||
220 | QTextStream readStream( &readFile ); | 220 | QTextStream readStream( &readFile ); |
221 | QTextStream writeStream( &writeFile ); | 221 | QTextStream writeStream( &writeFile ); |
222 | QString line; | 222 | QString line; |
223 | 223 | ||
224 | char k[21]; | 224 | char k[21]; |
225 | char v[1001]; | 225 | char v[1001]; |
226 | QString key; | 226 | QString key; |
227 | QString value; | 227 | QString value; |
228 | 228 | ||
229 | while ( !readStream.atEnd() ) | 229 | while ( !readStream.atEnd() ) |
230 | { | 230 | { |
231 | //read new line | 231 | //read new line |
232 | line = readStream.readLine(); | 232 | line = readStream.readLine(); |
233 | 233 | ||
234 | if ( line.contains( ":", TRUE ) ) | 234 | if ( line.contains( ":", TRUE ) ) |
235 | { | 235 | { |
236 | //grep key and value from line | 236 | //grep key and value from line |
@@ -249,49 +249,56 @@ void Ipkg :: removeStatusEntry() | |||
249 | if ( key == "Package" && value == package ) | 249 | if ( key == "Package" && value == package ) |
250 | { | 250 | { |
251 | //skip lines from the deleted package | 251 | //skip lines from the deleted package |
252 | while ( ( !readStream.atEnd() ) && ( line.stripWhiteSpace() != "" ) ) | 252 | while ( ( !readStream.atEnd() ) && ( line.stripWhiteSpace() != "" ) ) |
253 | { | 253 | { |
254 | line = readStream.readLine(); | 254 | line = readStream.readLine(); |
255 | } | 255 | } |
256 | } else { | 256 | } else { |
257 | 257 | ||
258 | //write other lines into the tempfile | 258 | //write other lines into the tempfile |
259 | writeStream << line << "\n"; | 259 | writeStream << line << "\n"; |
260 | 260 | ||
261 | // Improve UI responsiveness | 261 | // Improve UI responsiveness |
262 | i++; | 262 | i++; |
263 | if ( ( i % 50 ) == 0 ) | 263 | if ( ( i % 50 ) == 0 ) |
264 | qApp->processEvents(); | 264 | qApp->processEvents(); |
265 | } | 265 | } |
266 | } | 266 | } |
267 | 267 | ||
268 | readFile.close(); | 268 | readFile.close(); |
269 | writeFile.close(); | 269 | writeFile.close(); |
270 | 270 | ||
271 | // Remove old status file and put tmp stats file in its place | 271 | // Remove old status file and put tmp stats file in its place |
272 | remove( statusFile ); | 272 | remove( statusFile ); |
273 | rename( outStatusFile, statusFile ); | 273 | if (::rename( outStatusFile, statusFile ) == -1) |
274 | { | ||
275 | tempstr = tr("Couldn't rename temporary status file - "); | ||
276 | tempstr.append( outStatusFile ); | ||
277 | tempstr.append( tr("to status file - ") ); | ||
278 | tempstr.append( statusFile ); | ||
279 | emit outputText( tempstr ); | ||
280 | } | ||
274 | } | 281 | } |
275 | 282 | ||
276 | int Ipkg :: executeIpkgLinkCommand( QStringList *cmd ) | 283 | int Ipkg :: executeIpkgLinkCommand( QStringList *cmd ) |
277 | { | 284 | { |
278 | // If one is already running - should never be but just to be safe | 285 | // If one is already running - should never be but just to be safe |
279 | if ( proc ) | 286 | if ( proc ) |
280 | { | 287 | { |
281 | delete proc; | 288 | delete proc; |
282 | proc = 0; | 289 | proc = 0; |
283 | } | 290 | } |
284 | 291 | ||
285 | // OK we're gonna use OProcess to run this thing | 292 | // OK we're gonna use OProcess to run this thing |
286 | proc = new OProcess(); | 293 | proc = new OProcess(); |
287 | aborted = false; | 294 | aborted = false; |
288 | 295 | ||
289 | // Connect up our slots | 296 | // Connect up our slots |
290 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), | 297 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), |
291 | this, SLOT( linkProcessFinished())); | 298 | this, SLOT( linkProcessFinished())); |
292 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 299 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
293 | this, SLOT(linkCommandStdout(Opie::Core::OProcess*,char*,int))); | 300 | this, SLOT(linkCommandStdout(Opie::Core::OProcess*,char*,int))); |
294 | 301 | ||
295 | *proc << *cmd; | 302 | *proc << *cmd; |
296 | 303 | ||
297 | if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) | 304 | if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) |