diff options
Diffstat (limited to 'gbp/pkg/pristinetar.py')
| -rw-r--r-- | gbp/pkg/pristinetar.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gbp/pkg/pristinetar.py b/gbp/pkg/pristinetar.py index 91977897..79e1334e 100644 --- a/gbp/pkg/pristinetar.py +++ b/gbp/pkg/pristinetar.py @@ -20,9 +20,10 @@ import os import gbp.log from gbp.command_wrappers import Command + class PristineTar(Command): """The pristine-tar branch in a git repository""" - cmd='/usr/bin/pristine-tar' + cmd = '/usr/bin/pristine-tar' branch = 'pristine-tar' def __init__(self, repo): @@ -63,7 +64,7 @@ class PristineTar(Command): @param archive: the name of the orig archive @type archive: C{str} """ - self.run_error = 'Pristine-tar couldn\'t checkout "%s": {stderr}' % os.path.basename(archive) + self.run_error = 'Pristine-tar couldn\'t checkout "%s": {stderr_or_reason}' % os.path.basename(archive) self.__call__(['checkout', archive]) def commit(self, archive, upstream): @@ -76,7 +77,6 @@ class PristineTar(Command): @param upstream: the upstream branch to diff against @type upstream: C{str} """ - self.run_error = ("Couldn't commit to '%s' with upstream '%s': {stderr}" % + self.run_error = ("Couldn't commit to '%s' with upstream '%s': {stderr_or_reason}" % (self.branch, upstream)) self.__call__(['commit', archive, upstream]) - |