From 3e4d8c2be69d136d955b95075242e7bd76b8d3c1 Mon Sep 17 00:00:00 2001 From: Dirk Baechle Date: Mon, 28 Apr 2014 18:39:49 +0200 Subject: - switched argument type of fs_delete and _clean_targets to bool (was int before) --- src/engine/SCons/Script/Main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 7abea3f..fb58e9b 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -312,7 +312,7 @@ class BuildTask(SCons.Taskmaster.OutOfDateTask): class CleanTask(SCons.Taskmaster.AlwaysTask): """An SCons clean task.""" - def fs_delete(self, path, pathstr, remove=1): + def fs_delete(self, path, pathstr, remove=True): try: if os.path.lexists(path): if os.path.isfile(path) or os.path.islink(path): @@ -346,7 +346,7 @@ class CleanTask(SCons.Taskmaster.AlwaysTask): result = [t for t in self.targets if not t.noclean] return result - def _clean_targets(self, remove): + def _clean_targets(self, remove=True): target = self.targets[0] if target in SCons.Environment.CleanTargets: files = SCons.Environment.CleanTargets[target] @@ -357,7 +357,7 @@ class CleanTask(SCons.Taskmaster.AlwaysTask): for t in self._get_files_to_clean(): if not t.isdir(): display("Removed " + str(t)) - self._clean_targets(0) + self._clean_targets(remove=False) def remove(self): for t in self._get_files_to_clean(): @@ -373,7 +373,7 @@ class CleanTask(SCons.Taskmaster.AlwaysTask): else: if removed: display("Removed " + str(t)) - self._clean_targets(1) + self._clean_targets(remove=True) execute = remove -- cgit v0.12