[zorg] r188751 - Revert "For some reason I am running into issues using the word artifacts. Out of paranoia I am going to change the name to see if it makes a difference."

[Michael Gottesman]

Author: mgottesman
Date: Tue Aug 20 01:06:18 2013
New Revision: 188751

URL: http://llvm.org/viewvc/llvm-project?rev=188751&view=rev
Log:
Revert "For some reason I am running into issues using the word artifacts. Out of paranoia I am going to change the name to see if it makes a difference."

This reverts commit r188750.

Figured out the issue locally.

Modified:
    zorg/trunk/zorg/buildbot/builders/LibCXXBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/LibCXXBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LibCXXBuilder.py?rev=188751&r1=188750&r2=188751&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LibCXXBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LibCXXBuilder.py Tue Aug 20 01:06:18 2013
@@ -7,11 +7,11 @@ import buildbot.steps.source.svn as svn
 import buildbot.process.properties as properties
 
 import zorg.buildbot.commands.LitTestCommand as lit_test_command
-import zorg.buildbot.Artifacts as compiler_artifacts
+import zorg.buildbot.Artifacts as artifacts
 import zorg.buildbot.PhasedBuilderUtils as phased_builder_utils
 
 reload(lit_test_command)
-reload(compiler_artifacts)
+reload(artifacts)
 reload(phased_builder_utils)
 
 def getLibCXXBuilder():
@@ -27,10 +27,10 @@ def getLibCXXBuilder():
     
     # Find the build directory and grab the artifacts for our build.
     f = phased_builder_utils.getBuildDir(f)
-    f = compiler_artifacts.GetCompilerArtifacts(f)
+    f = artifacts.GetCompilerArtifacts(f)
     host_compiler_dir = properties.WithProperties('%(builddir)s/host-compiler')
-    f = compiler_artifacts.GetCCFromCompilerArtifacts(f, host_compiler_dir)
-    f = compiler_artifacts.GetCXXFromCompilerArtifacts(f, host_compiler_dir)
+    f = artifacts.GetCCFromCompilerArtifacts(f, host_compiler_dir)
+    f = artifacts.GetCXXFromCompilerArtifacts(f, host_compiler_dir)
     
     # Build libcxx.
     CC = properties.WithProperties('%(cc_path)s')