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
@@ -164,158 +164,165 @@ void Ipkg :: createSymLinks()
             for ( pkg = dependantPackages->first(); pkg != 0; pkg = dependantPackages->next() )
             {
                 if ( *pkg == package )
                     continue;
                 emit outputText( " " );
                 emit outputText( tr( "Creating symbolic links for %1" ).arg( *pkg ) );
                 linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir );
             }
         }
     }
 
     delete dependantPackages;
 
     emit outputText( tr("Finished") );
     emit outputText( "" );
 }
 
 void Ipkg :: removeStatusEntry()
 {
     QString statusFile = destDir;
     if ( statusFile.right( 1 ) != "/" )
         statusFile.append( "/" );
     statusFile.append( "usr/lib/ipkg/status" );
     QString outStatusFile = statusFile;
     outStatusFile.append( ".tmp" );
 
     emit outputText( "" );
     emit outputText( tr("Removing status entry...") );
     QString tempstr = tr("status file - ");
     tempstr.append( statusFile );
     emit outputText( tempstr );
     tempstr = tr("package - ");
     tempstr.append( package );
     emit outputText( tempstr );
 
     QFile readFile( statusFile );
     QFile writeFile( outStatusFile );
 
     if ( !readFile.open( IO_ReadOnly ) )
     {
         tempstr = tr("Couldn't open status file - ");
         tempstr.append( statusFile );
         emit outputText( tempstr );
         return;
     }
 
     if ( !writeFile.open( IO_WriteOnly ) )
     {
-        tempstr = tr("Couldn't create tempory status file - ");
+        tempstr = tr("Couldn't create temporary status file - ");
         tempstr.append( outStatusFile );
         emit outputText( tempstr );
         return;
     }
 
     int i = 0;
 
     QTextStream readStream( &readFile );
     QTextStream writeStream( &writeFile );
     QString line;
 
     char k[21];
     char v[1001];
     QString key;
     QString value;
 
     while ( !readStream.atEnd() )
     {
         //read new line
         line = readStream.readLine();
 
         if ( line.contains( ":", TRUE ) )
         {
             //grep key and value from line
             k[0] = '\0';
             v[0] = '\0';
             sscanf( line, "%[^:]: %[^\n]", k, v );
             key = k;
             value = v;
             key = key.stripWhiteSpace();
             value = value.stripWhiteSpace();
         } else {
             key = "";
             value = "";
         }
 
         if ( key == "Package" && value == package )
         {
             //skip lines from the deleted package
             while ( ( !readStream.atEnd() ) && ( line.stripWhiteSpace() != "" ) )
             {
                 line = readStream.readLine();
             }
         } else {
 
             //write other lines into the tempfile
             writeStream << line << "\n";
 
             // Improve UI responsiveness
             i++;
             if ( ( i % 50 ) == 0 )
                 qApp->processEvents();
         }
     }
 
     readFile.close();
     writeFile.close();
 
     // Remove old status file and put tmp stats file in its place
     remove( statusFile );
-    rename( outStatusFile, statusFile );
+    if (::rename( outStatusFile, statusFile ) == -1)
+    {
+        tempstr = tr("Couldn't rename temporary status file - ");
+        tempstr.append( outStatusFile );
+        tempstr.append( tr("to status file - ") );
+        tempstr.append( statusFile );
+        emit outputText( tempstr );
+    }
  }
 
 int Ipkg :: executeIpkgLinkCommand( QStringList *cmd )
 {
     // If one is already running - should never be but just to be safe
     if ( proc )
     {
         delete proc;
         proc = 0;
     }
 
     // OK we're gonna use OProcess to run this thing
     proc = new OProcess();
     aborted = false;
 
     // Connect up our slots
     connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
             this, SLOT( linkProcessFinished()));
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
             this, SLOT(linkCommandStdout(Opie::Core::OProcess*,char*,int)));
 
      *proc << *cmd;
 
     if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
     {
         emit outputText( tr("Couldn't start ipkg-link process" ) );
     }
 
     return 0;
 }
 
 void Ipkg::linkProcessFinished()
 {
     // Report that the link process succeeded/failed
 
     if ( error )
         emit outputText( tr("Symbolic linking failed!\n") );
     else
         emit outputText( tr("Symbolic linking succeeded.\n") );
 
     delete proc;
     proc = 0;
     finished = true;
 }
 
 void Ipkg::linkCommandStdout(OProcess*, char *buffer, int buflen)
 {
     QString lineStr = buffer;