[llvm-commits] [zorg] r171518 - /zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py

[David Dean]

Author: ddean
Date: Fri Jan  4 14:17:20 2013
New Revision: 171518

URL: http://llvm.org/viewvc/llvm-project?rev=171518&view=rev
Log:
Don't do things twice, reuse value already calculated elsewhere.

Modified:
    zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py

Modified: zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py?rev=171518&r1=171517&r2=171518&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py (original)
+++ zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py Fri Jan  4 14:17:20 2013
@@ -9,6 +9,7 @@
 from buildbot.steps.shell import WithProperties
 from buildbot.steps.trigger import Trigger
 from datetime import datetime, date, time
+import zorg
 
 class NamedTrigger(Trigger):
     """Trigger subclass which allows overriding the trigger name, and also
@@ -114,14 +115,12 @@
     return f
 
 def GetLatestValidated(f):
-    master_name = set_config_option('Master Options', 'master_name')
-    download_url = 'http://%s/artifacts' % master_name
     f.addStep(buildbot.steps.shell.ShellCommand(
             name='rm.host-compiler',
             command=['rm', '-rfv', 'host-compiler', 'host-compiler.tar.gz'],
             haltOnFailure=False, description=['rm', 'host-compiler'],
             workdir=WithProperties('%(builddir)s')))
-    latest_url = download_url
+    latest_url = zorg.buildbot.Artifacts.base_download_url
     latest_url += '/latest_validated/apple-clang-x86_64-darwin10-R.tar.gz'
     f.addStep(buildbot.steps.shell.ShellCommand(
               name='download.artifacts',