diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-29 16:52:11 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-29 16:52:11 +0000 |
commit | 4f959335730d37be8d7cd53a2af668d8887e72cc (patch) | |
tree | 6b4ad47fb92147c9c676e28e28be33be0ccf9bb7 /morphlib/cachedrepo.py | |
parent | 84c4a5e510fb014684f4b668a22c8eaa5cd51606 (diff) | |
download | morph-4f959335730d37be8d7cd53a2af668d8887e72cc.tar.gz |
Remove workaround for an old version of Git
Diffstat (limited to 'morphlib/cachedrepo.py')
-rw-r--r-- | morphlib/cachedrepo.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/morphlib/cachedrepo.py b/morphlib/cachedrepo.py index 2fc7cfa5..30e08ad9 100644 --- a/morphlib/cachedrepo.py +++ b/morphlib/cachedrepo.py @@ -297,12 +297,8 @@ class CachedRepo(object): raise CheckoutError(self, ref, target_dir) def _update(self): # pragma: no cover - try: - morphlib.git.gitcmd(self._runcmd, 'remote', 'update', - 'origin', '--prune') - except cliapp.AppException, ae: - morphlib.git.gitcmd(self._runcmd, 'remote', 'prune', 'origin') - morphlib.git.gitcmd(self._runcmd, 'remote', 'update', 'origin') + morphlib.git.gitcmd(self._runcmd, 'remote', 'update', + 'origin', '--prune') def __str__(self): # pragma: no cover return self.url |