diff -r e84d55688303 -r 9ef90235f8bb autobuild/common.py --- a/autobuild/common.py Fri Jan 20 10:06:14 2012 -0500 +++ b/autobuild/common.py Mon Jan 23 15:58:14 2012 -0500 @@ -113,7 +113,7 @@ return dict(os.environ, AUTOBUILD=os.environ.get( 'AUTOBUILD', get_autobuild_executable_path())) -def get_default_install_cache_dir(): +def get_install_cache_dir(): """ In general, the package archives do not change much, so find a host/user specific location to cache files. @@ -199,7 +199,7 @@ The file may not actually exist. """ filename = os.path.basename(package) - return os.path.join(get_default_install_cache_dir(), filename) + return os.path.join(get_install_cache_dir(), filename) def is_package_in_cache(package): """ diff -r e84d55688303 -r 9ef90235f8bb autobuild/tests/test_install.py --- a/autobuild/tests/test_install.py Fri Jan 20 10:06:14 2012 -0500 +++ b/autobuild/tests/test_install.py Mon Jan 23 15:58:14 2012 -0500 @@ -212,7 +212,7 @@ # Capture initial state of the autobuild download cache. Use a set so we # can take set difference with subsequent snapshot. - INIT_CACHE = set(os.listdir(common.get_default_install_cache_dir())) + INIT_CACHE = set(os.listdir(common.get_install_cache_dir())) # For the duration of this script, run a server thread from which to # direct autobuild to "download" test archives. Various tests will @@ -380,7 +380,7 @@ raise RuntimeError("clean_cache() called before module setup()!?") # Okay, we believe INIT_CACHE is valid. Inventory cache directory again # to discover what we've added since we started. - cachedir = common.get_default_install_cache_dir() + cachedir = common.get_install_cache_dir() for f in set(os.listdir(cachedir)) - INIT_CACHE: clean_file(os.path.join(cachedir, f)) @@ -638,7 +638,7 @@ # SERVER_DIR; in fact ensure it's not there. assert not os.path.exists(in_dir(SERVER_DIR, fixture.pathname)) # Instead copy directly to cache dir. - self.copyto(fixture.pathname, common.get_default_install_cache_dir()) + self.copyto(fixture.pathname, common.get_install_cache_dir()) # Create variant config file self.new_package(fixture.package) @@ -655,7 +655,7 @@ self.fixture = FIXTURES[self.pkg + "-0.1"] # Make sure this fixture isn't in either the server directory or cahce: assert not os.path.exists(in_dir(SERVER_DIR, self.fixture.pathname)) - assert not os.path.exists(in_dir(common.get_default_install_cache_dir(), self.fixture.pathname)) + assert not os.path.exists(in_dir(common.get_install_cache_dir(), self.fixture.pathname)) # Create variant config file self.new_package(self.fixture.package) @@ -676,7 +676,7 @@ # ArchiveFixture creates tarballs in STAGING_DIR. Don't copy to # SERVER_DIR; in fact ensure it's neither there nor in cache dir. assert not os.path.exists(in_dir(SERVER_DIR, fixture.pathname)) - self.cache_name = in_dir(common.get_default_install_cache_dir(), fixture.pathname) + self.cache_name = in_dir(common.get_install_cache_dir(), fixture.pathname) assert not os.path.exists(self.cache_name) # Create variant config file self.new_package(fixture.package) @@ -695,7 +695,7 @@ # ArchiveFixture creates tarballs in STAGING_DIR. Have to copy to # SERVER_DIR if we want to be able to download. self.copyto(fixture.pathname, SERVER_DIR) - self.cache_name = in_dir(common.get_default_install_cache_dir(), fixture.pathname) + self.cache_name = in_dir(common.get_install_cache_dir(), fixture.pathname) assert not os.path.exists(self.cache_name) # Fake up a PackageDescription with bad MD5 without disturbing # FIXTURES["bogus-0.1"], which is shared with several other tests.