[llvm-commits] [zorg] r169789 - /zorg/trunk/zorg/buildbot/Artifacts.py

[David Dean]

Author: ddean
Date: Mon Dec 10 17:04:30 2012
New Revision: 169789

URL: http://llvm.org/viewvc/llvm-project?rev=169789&view=rev
Log:
Determine dowload protocol from local.cfg (remove a hack based on server name)

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

Modified: zorg/trunk/zorg/buildbot/Artifacts.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/Artifacts.py?rev=169789&r1=169788&r2=169789&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/Artifacts.py (original)
+++ zorg/trunk/zorg/buildbot/Artifacts.py Mon Dec 10 17:04:30 2012
@@ -9,13 +9,9 @@
 if is_production:
     rsync_user = config.options.get('Master Options', 'rsync_user')
     master_name = config.options.get('Master Options', 'master_name')
+    master_protocol = config.options.get('Master Options', 'protocol')
 
-    # TODO: Fix this up. Quick hack to get smooshbase up.
-    if master_name == "smooshbase.apple.com":
-        protocol = "https"
-    else:
-        protocol = "http"
-    base_download_url = '%s://%s/artifacts' % (protocol, master_name)
+    base_download_url = '%s://%s/artifacts' % (master_protocol, master_name)
     package_url = 'http://smooshlab.apple.com/packages'
 else:
     # If we aren't in production mode, assume that we are just using a local