summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2014-04-28 18:39:49 +0200
committerDirk Baechle <dl9obn@darc.de>2014-04-28 18:39:49 +0200
commit6f43351b99007f19401f276448d069598ee82f28 (patch)
treed1a7611a678611c456820693a45d0ff09eeba2a5
parent77d46c0e0f1d743569084aa7018f3b90e6dfe225 (diff)
downloadscons-6f43351b99007f19401f276448d069598ee82f28.tar.gz
- switched argument type of fs_delete and _clean_targets to bool (was int before)
-rw-r--r--src/engine/SCons/Script/Main.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 7abea3fe..fb58e9b5 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