Bug 1132458 - Improve mozharness l10n setup time: remove PurgeMixin from DesktopSingleLocale. r=jlund
authorMassimo Gervasini <mgervasini@mozilla.com>
Mon, 09 Mar 2015 11:00:26 +0100 (2015-03-09)
changeset 3724 29e05187fb530b4d368b76e750a5c6f920a94733
parent 3723 b3fa3fcc09293069129d394053dc314de8d97ba3
child 3725 310a5721cae79b1a4b75e611730623bd78c46033
push id2928
push usermgervasini@mozilla.com
push dateMon, 09 Mar 2015 10:00:58 +0000 (2015-03-09)
reviewersjlund
bugs1132458
Bug 1132458 - Improve mozharness l10n setup time: remove PurgeMixin from DesktopSingleLocale. r=jlund
scripts/desktop_l10n.py
--- a/scripts/desktop_l10n.py
+++ b/scripts/desktop_l10n.py
@@ -21,17 +21,16 @@ sys.path.insert(1, os.path.dirname(sys.p
 from mozharness.base.errors import BaseErrorList, MakefileErrorList
 from mozharness.base.script import BaseScript
 from mozharness.base.vcs.vcsbase import VCSMixin
 from mozharness.mozilla.buildbot import BuildbotMixin
 from mozharness.mozilla.building.buildbase import MakeUploadOutputParser
 from mozharness.mozilla.l10n.locales import LocalesMixin
 from mozharness.mozilla.mar import MarMixin
 from mozharness.mozilla.mock import MockMixin
-from mozharness.mozilla.purge import PurgeMixin
 from mozharness.mozilla.release import ReleaseMixin
 from mozharness.mozilla.signing import SigningMixin
 from mozharness.mozilla.updates.balrog import BalrogMixin
 from mozharness.mozilla.mock import ERROR_MSGS
 
 try:
     import simplejson as json
     assert json
@@ -62,18 +61,18 @@ configuration_tokens = ('branch',
 # some other values such as "%(version)s", "%(buildid)s", ...
 # are defined at run time and they cannot be enforced in the _pre_config_lock
 # phase
 runtime_config_tokens = ('buildid', 'version', 'locale', 'from_buildid',
                          'abs_objdir', 'abs_merge_dir', 'version', 'to_buildid')
 
 
 # DesktopSingleLocale {{{1
-class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, PurgeMixin,
-                          BuildbotMixin, VCSMixin, SigningMixin, BaseScript,
+class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
+                          VCSMixin, SigningMixin, BaseScript,
                           BalrogMixin, MarMixin):
     """Manages desktop repacks"""
     config_options = [[
         ['--balrog-config', ],
         {"action": "extend",
          "dest": "config_files",
          "type": "string",
          "help": "Specify the balrog configuration file"}
@@ -502,20 +501,20 @@ class DesktopSingleLocale(LocalesMixin, 
         self.set_buildbot_property("locales",
                                    json.dumps(self.locales_property),
                                    write_to_file=True)
 
     # Actions {{{2
     def clobber(self):
         """clobber"""
         dirs = self.query_abs_dirs()
-        config = self.config
-        objdir = os.path.join(dirs['abs_work_dir'], config['mozilla_dir'],
-                              config['objdir'])
-        PurgeMixin.clobber(self, always_clobber_dirs=[objdir])
+        clobber_dirs = (dirs['abs_objdir'], dirs['abs_compare_locales_dir'],
+                        dirs['abs_upload_dir'])
+        for directory in clobber_dirs:
+            self.rmtree(directory)
 
     def pull(self):
         """pulls source code"""
         config = self.config
         dirs = self.query_abs_dirs()
         repos = []
         # replace dictionary for repos
         # we need to interpolate some values: