From b007f6d01d0b0bb18e9d086c45d4aa923de0d1c8 Mon Sep 17 00:00:00 2001 From: "nrthomas%gmail.com" Date: Wed, 26 Nov 2008 09:39:35 +0000 Subject: [PATCH] Bug 464093, fix up deletion of old nightly builds, p=catlee, r=me git-svn-id: svn://10.0.0.236/trunk@255211 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/tools/buildbotcustom/process/factory.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mozilla/tools/buildbotcustom/process/factory.py b/mozilla/tools/buildbotcustom/process/factory.py index c95a6bc88e4..1224c0e227b 100644 --- a/mozilla/tools/buildbotcustom/process/factory.py +++ b/mozilla/tools/buildbotcustom/process/factory.py @@ -217,7 +217,9 @@ class MercurialBuildFactory(BuildFactory): env=self.env ) self.addStep(ShellCommand, - command=['bash', '-c', 'rm -rf ../../*-nightly/build'], + command=['bash', '-c', + 'find .. -maxdepth 2 -type d -path "*-nightly/build" -print -exec rm -rf {} \;'], + workdir='.', env = self.env, description=['cleaning', 'old', 'builds'], descriptionDone=['clean', 'old', 'builds'], @@ -612,7 +614,9 @@ class RepackFactory(BuildFactory): haltOnFailure=True ) self.addStep(ShellCommand, - command=['bash', '-c', 'rm -rf ../../*-nightly/build'], + command=['bash', '-c', + 'find .. -maxdepth 2 -type d -path "*-nightly/build" -not -path "*-l10n-nightly/build" -print -exec rm -rf {} \;'], + workdir='.', description=['cleaning', 'old', 'builds'], descriptionDone=['clean', 'old', 'builds'], warnOnFailure=True, @@ -1397,7 +1401,9 @@ class UnittestBuildFactory(BuildFactory): ) self.addStep(ShellCommand, - command=['rm', '-rf', '../../*-nightly/build'], + command=['bash', '-c', + 'find .. -maxdepth 2 -type d -path "*-nightly/build" -print -exec rm -rf {} \;'], + workdir='.', description=['cleaning', 'old', 'builds'], descriptionDone=['clean', 'old', 'builds'], warnOnFailure=True,