-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 | |||
@@ -200,25 +200,25 @@ void Ipkg :: removeStatusEntry() | |||
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]; |
@@ -261,25 +261,32 @@ void Ipkg :: removeStatusEntry() | |||
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 |