[jhbuild] Don't run clean if distclean requested (GNOME bug 681289)



commit b9e7a4f043dfb21389b8ade1dbf3bc6ac3668c02
Author: Craig Keogh <cskeogh adam com au>
Date:   Wed Aug 15 16:51:40 2012 +0930

    Don't run clean if distclean requested (GNOME bug 681289)

 jhbuild/modtypes/autotools.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index 95eb95a..e7f794d 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -214,6 +214,8 @@ class AutogenModule(MakeModule, DownloadableModule):
             PHASE_CLEAN, PHASE_DISTCLEAN]
 
     def skip_clean(self, buildscript, last_phase):
+        if 'distclean' in self.config.build_targets:
+            return True
         builddir = self.get_builddir(buildscript)
         if not os.path.exists(builddir):
             return True
@@ -315,7 +317,10 @@ class AutogenModule(MakeModule, DownloadableModule):
         return self.config.noinstall or self.skip_install_phase
 
     def skip_distclean(self, buildscript, last_phase):
-        return self.skip_clean(buildscript, last_phase)
+        builddir = self.get_builddir(buildscript)
+        if not os.path.exists(builddir):
+            return True
+        return False
 
     def do_distclean(self, buildscript):
         buildscript.set_action(_('Distcleaning'), self)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]