From 607991ef4d0e56a18933e6a72ac95d3ff90c5fb8 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 14 May 2017 14:17:28 -0500 Subject: [PATCH] Move _git_wait and _git_capture before use Signed-off-by: Rob Browning Tested-by: Rob Browning --- lib/bup/git.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/bup/git.py b/lib/bup/git.py index 31ae342..8dd9236 100644 --- a/lib/bup/git.py +++ b/lib/bup/git.py @@ -35,6 +35,18 @@ class GitError(Exception): pass +def _git_wait(cmd, p): + rv = p.wait() + if rv != 0: + raise GitError('%s returned %d' % (cmd, rv)) + +def _git_capture(argv): + p = subprocess.Popen(argv, stdout=subprocess.PIPE, preexec_fn = _gitenv()) + r = p.stdout.read() + _git_wait(repr(argv), p) + return r + + def parse_tz_offset(s): """UTC offset in seconds.""" tz_off = (int(s[1:3]) * 60 * 60) + (int(s[3:5]) * 60) @@ -1058,19 +1070,6 @@ def ver(): return _ver -def _git_wait(cmd, p): - rv = p.wait() - if rv != 0: - raise GitError('%s returned %d' % (cmd, rv)) - - -def _git_capture(argv): - p = subprocess.Popen(argv, stdout=subprocess.PIPE, preexec_fn = _gitenv()) - r = p.stdout.read() - _git_wait(repr(argv), p) - return r - - class _AbortableIter: def __init__(self, it, onabort = None): self.it = it -- 2.39.2