phase1: always allow user clean targets

Also allow user clean targets if a tree expiry has been configured.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index f92a08079ac802b1263f8b373c8b0af0013f472d..4014c20046d478ec8709ca24514abbf3d40c48dc 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -250,14 +250,13 @@ for target in targets:
                        timeout = 2400))
 
        # user-requested clean targets
-       else:
-               for tuple in CleanTargetMap:
-                       factory.addStep(ShellCommand(
-                               name = tuple[1],
-                               description = 'User-requested "make %s"' % tuple[1],
-                               command = ["make", tuple[1], "V=s"],
-                               doStepIf = IsCleanRequested(tuple[0])
-                       ))
+       for tuple in CleanTargetMap:
+               factory.addStep(ShellCommand(
+                       name = tuple[1],
+                       description = 'User-requested "make %s"' % tuple[1],
+                       command = ["make", tuple[1], "V=s"],
+                       doStepIf = IsCleanRequested(tuple[0])
+               ))
 
        # check out the source
        factory.addStep(Git(repourl=repo_url, mode='update'))