[zorg] r188632 - [llvmlab] Make default artifacts_path always use a path that has been run through os.path.expanduser.

Michael Gottesman mgottesman at apple.com
Sun Aug 18 02:14:10 PDT 2013


Author: mgottesman
Date: Sun Aug 18 04:14:09 2013
New Revision: 188632

URL: http://llvm.org/viewvc/llvm-project?rev=188632&view=rev
Log:
[llvmlab] Make default artifacts_path always use a path that has been run through os.path.expanduser.

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=188632&r1=188631&r2=188632&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/Artifacts.py (original)
+++ zorg/trunk/zorg/buildbot/Artifacts.py Sun Aug 18 04:14:09 2013
@@ -1,3 +1,5 @@
+import os
+
 import buildbot
 import config
 
@@ -19,7 +21,7 @@ if is_production:
     package_url = set_config_option('Master Options', 'package_url',
                                     base_package_url)
     artifacts_path = set_config_option('Master Options', 'artifacts_path',
-                                       '~/artifacts')
+                                       os.path.expanduser('~/artifacts'))
     curl_flags = set_config_option('Master Options', 'curl_flags',
                                    '-fvLo')    
 else:
@@ -29,7 +31,7 @@ else:
     master_protocol = 'http'
     base_download_url = 'http://%s/~%s/artifacts' % (master_name, rsync_user)
     package_url = 'http://%s/~%s/packages' % (master_name, rsync_user)
-    artifacts_path = '~/artifacts'
+    artifacts_path = os.path.expanduser('~/artifacts')
     curl_flags = '-fvLo'
 
 base_rsync_path = '%s@%s:%s' % (rsync_user, master_name, artifacts_path)





More information about the llvm-commits mailing list