Permalink
Browse files

Merge pull request #107 from dcolish/master

Unpack tuple to get used local var
  • Loading branch information...
2 parents c6d21f0 + 4050896 commit de10e95eccca53ab125e76532a8ecaef09edec0f @ericholscher ericholscher committed Sep 10, 2011
Showing with 3 additions and 3 deletions.
  1. +3 −3 readthedocs/vcs_support/backends/git.py
View
6 readthedocs/vcs_support/backends/git.py
@@ -47,16 +47,16 @@ def reset(self):
branch = self.fallback_branch
if self.default_branch:
branch = self.default_branch
- reset_output = self.run('git', 'reset', '--hard',
+ code, out, err = self.run('git', 'reset', '--hard',
'origin/%s' % branch)
- if reset_output[0] != 0:
+ if code != 0:
print "Failed to get code from '%s' (git reset): %s" % (
self.repo_url, code)
print "Going on because this might not be horrible."
#raise ProjectImportError(
#"Failed to get code from '%s' (git reset): %s" % (self.repo_url, retcode)
#)
- return reset_output
+ return [code, out, err]
def clone(self):
code, out, err = self.run('git', 'clone', '--quiet',

0 comments on commit de10e95

Please sign in to comment.