2 files changed, 14 insertions, 3 deletions

diff --git a/core/opie-login/passworddialogimpl.cpp b/core/opie-login/passworddialogimpl.cpp
index d9132e2..3c1b474 100644
--- a/core/opie-login/passworddialogimpl.cpp
+++ b/core/opie-login/passworddialogimpl.cpp
@@ -165,5 +165,9 @@ void PasswordDialogImpl::writePassword() {
     ::fclose( file );
     ::endpwent();
-    ::rename("/etc/passwd.new","/etc/passwd" );
+    if (::rename("/etc/passwd.new","/etc/passwd" ) == -1)
+        return error( tr("Rename /etc/passwd failed"),
+                      tr("<qt>Renaming /etc/passwd.new to /etc/passwd failed."
+                         "Please check your /etc/passed file, your /etc directory "
+                         "or your filesystem.</qt>") );
 
     /* should be done now */
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
@@ -210,5 +210,5 @@ void Ipkg :: removeStatusEntry()
     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 );
@@ -271,5 +271,12 @@ void Ipkg :: removeStatusEntry()
     // 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 );
+    }
  }