diff options
| author | Guido Günther <agx@sigxcpu.org> | 2012-01-13 09:07:19 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2012-01-22 19:45:26 +0100 |
| commit | 5b5dbf61244708d9d234a3ef90ce85cd4f35f259 (patch) | |
| tree | 4ac0abfab8629011418c4bc6852b423295b1a2f3 /gbp/scripts/pull.py | |
| parent | 63b24cef4db5277eff7b38bbe359fc30f9d28b90 (diff) | |
| download | git-buildpackage-5b5dbf61244708d9d234a3ef90ce85cd4f35f259.tar.gz git-buildpackage-5b5dbf61244708d9d234a3ef90ce85cd4f35f259.tar.bz2 git-buildpackage-5b5dbf61244708d9d234a3ef90ce85cd4f35f259.zip | |
PristineTar: move to separate module
and make it accessible from GitRepository to group
checkout/checkin/lookup.
Diffstat (limited to 'gbp/scripts/pull.py')
| -rwxr-xr-x | gbp/scripts/pull.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py index face2cc1..5dc1b607 100755 --- a/gbp/scripts/pull.py +++ b/gbp/scripts/pull.py @@ -21,8 +21,7 @@ import sys import os, os.path -from gbp.command_wrappers import (Command, - CommandExecFailed, PristineTar) +from gbp.command_wrappers import (Command, CommandExecFailed) from gbp.config import (GbpOptionParser, GbpOptionGroup) from gbp.errors import GbpError from gbp.git import (GitRepositoryError, GitRepository) @@ -105,8 +104,8 @@ def main(argv): if repo.has_branch(branch): branches += [ branch ] - if repo.has_branch(PristineTar.branch) and options.pristine_tar: - branches += [ PristineTar.branch ] + if repo.has_pristine_tar_branch() and options.pristine_tar: + branches += [ repo.pristine_tar_branch ] (ret, out) = repo.is_clean() if not ret: |