[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    icecream/daemon
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-09-04 11:34:57
Message-ID: 1157369697.115758.11620.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 580739 by mueller:

the child can't remove a directory that is owned by root anyway


 M  +6 -10     environment.cpp  


--- trunk/icecream/daemon/environment.cpp #580738:580739
@@ -227,8 +227,10 @@
                 status = 1;
         }
         trace() << "native_environment " << native_environment << endl;
-        if ( status )
+        if ( status ) {
+            rmdir( nativedir.c_str() );
             return 0;
+        }
         else {
             return sumup_dir( nativedir );
         }
@@ -245,20 +247,14 @@
 
     if ( chdir( nativedir.c_str() ) ) {
          log_perror( "chdir" );
-         rmdir( nativedir.c_str() );
-         goto error;
+         _exit(1);
     }
 
     if ( system( BINDIR "/icecc --build-native" ) ) {
         log_error() << BINDIR "/icecc --build-native failed\n";
-        goto error;
-    } else {
-        _exit( 0 );
+        _exit(1);
     }
-
-error:
-    rmdir( nativedir.c_str() );
-    _exit( 1 );
+    _exit( 0 );
 }
 
 size_t install_environment( const std::string &basename, const std::string &target,
[prev in list] [next in list] [prev in thread] [next in thread]