summaryrefslogtreecommitdiff
path: root/gbp/scripts/import_orig.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2013-06-11 15:37:22 +0200
committerGuido Günther <agx@sigxcpu.org>2013-06-11 15:37:22 +0200
commit18bc529ef0e4913574b5d4d3d15ed35cf8cadff2 (patch)
treea19011462442bef46ca76814c50e44480647688b /gbp/scripts/import_orig.py
parent4d6eecb73e34d9751a05c3908b4ad3f8960619ad (diff)
Simplify expression
Git-Dch: Ignore
Diffstat (limited to 'gbp/scripts/import_orig.py')
-rw-r--r--gbp/scripts/import_orig.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py
index e28d750..d69743e 100644
--- a/gbp/scripts/import_orig.py
+++ b/gbp/scripts/import_orig.py
@@ -360,8 +360,8 @@ def main(argv):
# Update working copy and index if we've possibly updated the
# checked out branch
current_branch = repo.get_branch()
- if (current_branch == options.upstream_branch or
- current_branch == repo.pristine_tar_branch):
+ if current_branch in [ options.upstream_branch,
+ repo.pristine_tar_branch]:
repo.force_head(current_branch, hard=True)
except (gbpc.CommandExecFailed, GitRepositoryError) as err:
msg = err.__str__() if len(err.__str__()) else ''