diff options
| -rwxr-xr-x | morph | 2 | ||||
| -rw-r--r-- | morphlib/localrepocache.py | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -216,7 +216,7 @@ class Morph(cliapp.Application): ckc = morphlib.cachekeycomputer.CacheKeyComputer(build_env) lac = morphlib.localartifactcache.LocalArtifactCache(cachedir) lrc = morphlib.localrepocache.LocalRepoCache( - cachedir, + os.path.join(cachedir, 'gits'), self.settings['git-base-url'], bundle_base_url=self.settings['bundle-server']) rrc = None diff --git a/morphlib/localrepocache.py b/morphlib/localrepocache.py index 27c581aa..32f5a664 100644 --- a/morphlib/localrepocache.py +++ b/morphlib/localrepocache.py @@ -189,7 +189,7 @@ class LocalRepoCache(object): return False, 'Unable to fetch bundle %s: %s' % (bundle_url, e) try: - self._git(['clone', bundle_path, path]) + self._git(['clone', '-n', bundle_path, path]) self._git(['remote', 'set-url', 'origin', repourl], cwd=path) except morphlib.execute.CommandFailure, e: # pragma: no cover if self._exists(path): @@ -226,7 +226,7 @@ class LocalRepoCache(object): for repourl, path in self._base_iterate(reponame): try: - self._git(['clone', repourl, path]) + self._git(['clone', '-n', '-l', repourl, path]) except morphlib.execute.CommandFailure, e: errors.append('Unable to clone from %s to %s: %s' % (repourl, path, e)) |