Merging from default

changeset: 3060:3c45e39ee027 parent: 3057:84f077434979 user: Chris Cooper <ccooper@deadsquid.com> date: Mon Mar 18 15:05:23 2013 -0400 summary: Bug 851793 - Use full path to merged dir for l10n - r=armenzg changeset: 3061:212d3ad2c0c5 user: Chris AtLee <catlee@mozilla.com> date: Mon Mar 18 15:07:06 2013 -0400 summary: Bug 833334: forcibly close slave socket in disconnectstep. r=rail --HG-- branch : production-0.8
mozilla-releng · Mar 18, 2013 · 6aaab43 · 6aaab43
2 parents 278bd42 + 8973ba8
commit 6aaab43
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 23 deletions.
diff --git a/process/factory.py b/process/factory.py
@@ -3321,17 +3321,16 @@ def configure(self):
                                  mock=self.use_mock,
                                  target=self.mock_target,
         )))
-        if self.mozillaDir:
-            self.addStep(MockCommand(**self.processCommand(
-                name='rm_CLOBBER_files',
-                env=self.env,
-                command=['rm','-rf', '%s/CLOBBER' % self.absMozillaObjDir,
-                         '%s/CLOBBER' % self.absMozillaSrcDir,],
-                workdir='.',
-                description=['remove CLOBBER files'],
-                haltOnFailure=True,
-                mock=self.use_mock,
-                target=self.mock_target,
+        self.addStep(MockCommand(**self.processCommand(
+            name='rm_CLOBBER_files',
+            env=self.env,
+            command=['rm','-rf', '%s/CLOBBER' % self.absMozillaObjDir,
+                     '%s/CLOBBER' % self.absMozillaSrcDir,],
+            workdir='.',
+            description=['remove CLOBBER files'],
+            haltOnFailure=True,
+            mock=self.use_mock,
+            target=self.mock_target,
             )))
         self.addStep(MockCommand(**self.processCommand(
                                  name='compile_nsinstall',
@@ -3493,7 +3492,9 @@ def compareLocalesSetup(self):
 
     def compareLocales(self):
         if self.mergeLocales:
-            mergeLocaleOptions = ['-m', 'merged']
+            mergeLocaleOptions = ['-m',
+                                  WithProperties('%(basedir)s/' + \
+                                                 "%s/merged" % self.baseWorkDir)]
             flunkOnFailure = False
             haltOnFailure = False
             warnOnFailure = True
@@ -3506,9 +3507,7 @@ def compareLocales(self):
                      name='rm_merged',
                      command=['rm', '-rf', 'merged'],
                      description=['remove', 'merged'],
-                     workdir="%s/%s/%s/locales" % (self.baseWorkDir,
-                                                   self.origSrcDir,
-                                                   self.appName),
+                     workdir=self.baseWorkDir,
                      haltOnFailure=True
                      ))
         self.addStep(ShellCommand(
@@ -3524,9 +3523,8 @@ def compareLocales(self):
                      flunkOnFailure=flunkOnFailure,
                      warnOnFailure=warnOnFailure,
                      haltOnFailure=haltOnFailure,
-                     workdir="%s/%s/%s/locales" % (self.baseWorkDir,
-                                                   self.origSrcDir,
-                                                   self.appName),
+                     workdir="%s/%s/locales" % (self.absSrcDir,
+                                                self.appName),
                      ))
 
     def doRepack(self):
@@ -3612,14 +3610,14 @@ def doTestPrettyNames(self):
         self.addStep(MockCommand(
                      name='repack_installers_pretty',
                      description=['repack', 'installers', 'pretty'],
-                     command=['sh', '-c',
-                              WithProperties(
-                              'make installers-%(locale)s LOCALE_MERGEDIR=$PWD/merged')],
+                     command=self.makeCmd + [WithProperties('installers-%(locale)s'),
+                                             WithProperties('LOCALE_MERGEDIR=%(basedir)s/' + \
+                                                            "%s/merged" % self.baseWorkDir)],
                      env=prettyEnv,
                      haltOnFailure=False,
                      flunkOnFailure=False,
                      warnOnFailure=True,
-                     workdir='%s/%s/locales' % (self.absMozillaObjDir, self.appName),
+                     workdir='%s/%s/locales' % (self.absObjDir, self.appName),
                      mock=self.use_mock,
                      target=self.mock_target,
                      ))
@@ -3896,7 +3894,9 @@ def doRepack(self):
         self.addStep(MockCommand(
                      name='repack_installers',
                      description=['repack', 'installers'],
-                     command=self.makeCmd + [WithProperties('installers-%(locale)s'), 'LOCALE_MERGEDIR=$PWD/merged'],
+                     command=self.makeCmd + [WithProperties('installers-%(locale)s'),
+                                             WithProperties('LOCALE_MERGEDIR=%(basedir)s/' + \
+                                                            "%s/merged" % self.baseWorkDir)],
                      env=self.env,
                      haltOnFailure=True,
                      workdir='%s/%s/locales' % (self.absObjDir, self.appName),

diff --git a/steps/misc.py b/steps/misc.py
@@ -502,6 +502,11 @@ def die():
             self._deferred_death = None
             log.msg("Forcibly disconnecting %s" % self.getSlaveName())
             self.buildslave.disconnect()
+            try:
+                # Try to close the socket too
+                self.buildslave.slave.broker.transport._closeSocket()
+            except:
+                log.err()
         self._deferred_death = reactor.callLater(60, die)
         return self.super_class.start(self)