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

List:       kde-commits
Subject:    branches/KDE/3.5/kdesdk/scripts
From:       Michael Pyne <michael.pyne () kdemail ! net>
Date:       2005-07-31 20:45:05
Message-ID: 1122842705.701095.23271.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 441752 by mpyne:

Backport recent kdesvn-build changes to 3.5.


 M  +17 -15    kdesvn-build  


--- branches/KDE/3.5/kdesdk/scripts/kdesvn-build #441751:441752
@@ -3151,18 +3151,20 @@
         return 1;
     }
 
-    if (-e "$builddir" &&
-        safe_system ('rm', '-rf', "$builddir"))
+    if (-e "$builddir")
     {
-        # Remove build directory for normal module.
-        error "\tUnable to clean r[$builddir].";
-        return 0; # False for this function.
+        if(safe_system ('rm', '-rf', "$builddir"))
+        {
+            # Remove build directory for normal module.
+            error "\tUnable to clean r[$builddir].";
+            return 0; # False for this function.
+        }
+
+        # Let users know we're done so they don't wonder why rm -rf is taking so
+        # long and oh yeah, why'd my HD so active?...
+        info "\tOld build system cleaned, starting new build system.";
     }
 
-    # Let users know we're done so they don't wonder why rm -rf is taking so
-    # long and oh yeah, why'd my HD so active?...
-    info "\tOld build system cleaned, starting anew.";
-
     # Now create the directory
     if (not super_mkdir ("$builddir"))
     {
@@ -3699,12 +3701,6 @@
             next;
         }
 
-        if (pretending)
-        {
-            pretend "\tWould have installed g[$module]";
-            next;
-        }
-
         # Just in case, I guess.
         update_module_environment ($module);
 
@@ -3724,6 +3720,12 @@
             }
         }
 
+        if (pretending)
+        {
+            pretend "\tWould have installed g[$module]";
+            next;
+        }
+
         next if $result != 0; # Don't delete anything if the build failed.
 
         my $remove_setting = get_option($module, 'remove-after-install');
[prev in list] [next in list] [prev in thread] [next in thread]