Whitespace changes, not a good idea to have mixed spaces and tabs
authorPhilippe M. Chiasson <gozer@mozillamessaging.com>
Fri, 26 Sep 2008 10:43:25 -0400
changeset 373 addb25f0fc1f514c0a22bb7e69c73a6163073c72
parent 372 bf8a8755da8128afaae149bc62b6fbcb9a76d9f8
child 374 81c93a70f5f4d64246e3b6f347eeee66b2d1e9b7
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
Whitespace changes, not a good idea to have mixed spaces and tabs in a Python file.
thunderbird/Makefile
thunderbird/master.cfg
--- a/thunderbird/Makefile
+++ b/thunderbird/Makefile
@@ -2,18 +2,18 @@
 
 # This is a simple makefile which lives in a buildmaster/buildslave
 # directory (next to the buildbot.tac file). It allows you to start/stop the
 # master or slave by doing 'make start' or 'make stop'.
 
 # The 'reconfig' target will tell a buildmaster to reload its config file.
 
 start:
-	twistd --no_save -y buildbot.tac
+    twistd --no_save -y buildbot.tac
 
 stop:
-	kill `cat twistd.pid`
+    kill `cat twistd.pid`
 
 reconfig:
-	kill -HUP `cat twistd.pid`
+    kill -HUP `cat twistd.pid`
 
 log:
-	tail -f twistd.log
+    tail -f twistd.log
--- a/thunderbird/master.cfg
+++ b/thunderbird/master.cfg
@@ -270,52 +270,52 @@ for name in BRANCHES.keys():
             command=['make', '-f', 'client.mk', buildcmd],
             env=pf['env'],
             haltOnFailure=True,
             timeout=60*40
         ))
 
         if platform.find('debug') == -1:
             if branch['package']:
-		    mozilla2_dep_factory.addStep(ShellCommand(
-			command=['make', 'package'],
-			workdir='build/%s' % pf['platform_objdir'],
-			haltOnFailure=True
-		    ))
-		    if platform.startswith("win32"):
-			mozilla2_dep_factory.addStep(ShellCommand(
-			    command=['make', 'installer'],
-			    workdir='build/%s' % pf['platform_objdir'],
-			    haltOnFailure=True
-			))
-		    mozilla2_dep_factory.addStep(ShellCommand(
-			command=['make', 'package-compare'],
-			workdir='build/%s' % pf['platform_objdir'],
-			haltOnFailure=False
-		    ))
-	    mozilla2_dep_factory.addStep(SetMozillaBuildProperties(
-		objdir='build/%s/mozilla' % pf['platform_objdir']
-	    ))
-	    if branch['upload_stage']:
-		mozilla2_dep_factory.addStep(MozillaStageUpload(
-		    objdir='%s/mozilla' % pf['platform_objdir'],
-		    username=branch.get('stage_username',STAGE_USERNAME),
-		    milestone=name,
-		    remoteHost=branch.get('stage_server',STAGE_SERVER),
-		    remoteBasePath=branch.get('stage_base_path',STAGE_BASE_PATH),
-		    packageGlob=upload_glob,
-		    platform=realPlatform,
-		    group=branch.get('stage_group',STAGE_GROUP),
-		    sshKey=branch.get('stage_ssh_key',STAGE_SSH_KEY),
-		    releaseToLatest=False,
-		    releaseToDated=False,
-		    releaseToTinderboxBuilds=True,
-		    tinderboxBuildsDir='%s-%s' % (name, platform),
-		    dependToDated=True
-		))
+                    mozilla2_dep_factory.addStep(ShellCommand(
+                        command=['make', 'package'],
+                        workdir='build/%s' % pf['platform_objdir'],
+                        haltOnFailure=True
+                    ))
+                    if platform.startswith("win32"):
+                        mozilla2_dep_factory.addStep(ShellCommand(
+                            command=['make', 'installer'],
+                            workdir='build/%s' % pf['platform_objdir'],
+                            haltOnFailure=True
+                        ))
+                    mozilla2_dep_factory.addStep(ShellCommand(
+                        command=['make', 'package-compare'],
+                        workdir='build/%s' % pf['platform_objdir'],
+                        haltOnFailure=False
+                    ))
+            mozilla2_dep_factory.addStep(SetMozillaBuildProperties(
+                objdir='build/%s/mozilla' % pf['platform_objdir']
+            ))
+            if branch['upload_stage']:
+                mozilla2_dep_factory.addStep(MozillaStageUpload(
+                    objdir='%s/mozilla' % pf['platform_objdir'],
+                    username=branch.get('stage_username',STAGE_USERNAME),
+                    milestone=name,
+                    remoteHost=branch.get('stage_server',STAGE_SERVER),
+                    remoteBasePath=branch.get('stage_base_path',STAGE_BASE_PATH),
+                    packageGlob=upload_glob,
+                    platform=realPlatform,
+                    group=branch.get('stage_group',STAGE_GROUP),
+                    sshKey=branch.get('stage_ssh_key',STAGE_SSH_KEY),
+                    releaseToLatest=False,
+                    releaseToDated=False,
+                    releaseToTinderboxBuilds=True,
+                    tinderboxBuildsDir='%s-%s' % (name, platform),
+                    dependToDated=True
+                ))
             if branch['codesighs']:
                 if platform.find('win32') == -1 and platform.find('linux64') == -1:
                     # Codesighs
                     mozilla2_dep_factory.addStep(ShellCommand(
                         command=['make'],
                         workdir='build/%s/mozilla/tools/codesighs' % pf['platform_objdir']
                     ))
                     mozilla2_dep_factory.addStep(ShellCommand(
@@ -478,34 +478,34 @@ for name in BRANCHES.keys():
         ))
         if pf['upload_symbols']:
             mozilla2_nightly_factory.addStep(ShellCommand(
                 command=['make', 'buildsymbols'],
                 env=pf['env'],
                 workdir='build/%s' % pf['platform_objdir'],
                 haltOnFailure=True
             ))
-	if branch['package']:
-		mozilla2_nightly_factory.addStep(ShellCommand(
-		    command=['make', 'package'],
-		    workdir='build/%s' % pf['platform_objdir'],
-		    haltOnFailure=True
-		))
-		if platform.startswith("win32"):
-		    mozilla2_nightly_factory.addStep(ShellCommand(
-			command=['make', 'installer'],
-			workdir='build/%s' % pf['platform_objdir'],
-			haltOnFailure=True
-		    ))
-		mozilla2_nightly_factory.addStep(ShellCommand(
-		    command=['make', '-C',
-			     '%s/mozilla/tools/update-packaging' % pf['platform_objdir']],
-		    description=['create', 'complete', 'update'],
-		    haltOnFailure=True
-		))
+        if branch['package']:
+                mozilla2_nightly_factory.addStep(ShellCommand(
+                    command=['make', 'package'],
+                    workdir='build/%s' % pf['platform_objdir'],
+                    haltOnFailure=True
+                ))
+                if platform.startswith("win32"):
+                    mozilla2_nightly_factory.addStep(ShellCommand(
+                        command=['make', 'installer'],
+                        workdir='build/%s' % pf['platform_objdir'],
+                        haltOnFailure=True
+                    ))
+                mozilla2_nightly_factory.addStep(ShellCommand(
+                    command=['make', '-C',
+                             '%s/mozilla/tools/update-packaging' % pf['platform_objdir']],
+                    description=['create', 'complete', 'update'],
+                    haltOnFailure=True
+                ))
         mozilla2_nightly_factory.addStep(SetMozillaBuildProperties(
                 objdir='build/%s/mozilla' % pf['platform_objdir']
         ))
         if branch['upload_stage']:
             mozilla2_nightly_factory.addStep(MozillaStageUpload(
                     objdir='%s/mozilla' % pf['platform_objdir'],
                     username=branch.get('stage_username',STAGE_USERNAME),
                     milestone=branch.get('milestone', pf.get('milestone', name)),