diff options
-rwxr-xr-x | morph-cache-server | 7 | ||||
-rw-r--r-- | morphcacheserver/repocache.py | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/morph-cache-server b/morph-cache-server index 5554481c..57713e25 100755 --- a/morph-cache-server +++ b/morph-cache-server @@ -18,6 +18,7 @@ import cliapp import logging +import os import urllib from bottle import Bottle, request, response, run, static_file @@ -48,7 +49,7 @@ class MorphCacheServer(cliapp.Application): repo_cache = RepoCache(self, self.settings['repo-dir'], - self.settings['bundles']) + self.settings['bundle-dir']) @app.get('/sha1s') def sha1(): @@ -83,7 +84,9 @@ class MorphCacheServer(cliapp.Application): def bundle(): repo = self._unescape_parameter(request.query.repo) filename = repo_cache.get_bundle_filename(repo) - return static_file(filename, download=True) + dirname = os.path.dirname(filename) + basename = os.path.basename(filename) + return static_file(basename, root=dirname, download=True) root = Bottle() root.mount(app, '/1.0') diff --git a/morphcacheserver/repocache.py b/morphcacheserver/repocache.py index e6ab6401..3bb348ff 100644 --- a/morphcacheserver/repocache.py +++ b/morphcacheserver/repocache.py @@ -83,7 +83,7 @@ class RepoCache(object): def get_bundle_filename(self, repo_url): quoted_url = self._quote_url(repo_url) - return os.path.join(self.bundle_dir, '%s.bndl' % quoted_url) + return os.path.join(self.bundle_cache_dir, '%s.bndl' % quoted_url) def _quote_url(self, url): valid_chars = string.digits + string.letters + '%_' |