summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2010-08-09 09:43:10 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2010-08-09 09:43:10 +0200
commitc2fc9176a6b13eca27e2ef7ad9a7bd7b1694c02e (patch)
treeecd206e62e001ec51afa12982409fee0707c8a38
parent28a23f4f766f5f223ad93fe76fc209c6a6160a69 (diff)
downloadfedora-packager-c2fc9176a6b13eca27e2ef7ad9a7bd7b1694c02e.tar.gz
fedora-packager-c2fc9176a6b13eca27e2ef7ad9a7bd7b1694c02e.tar.xz
fedora-packager-c2fc9176a6b13eca27e2ef7ad9a7bd7b1694c02e.zip
Avoid unnecessary *arg expansion
foo(*([1, 2, 3]+[5, 6, 7])) is easier written as foo(1, 2, 3, *[5, 6, 7]).
-rwxr-xr-xsrc/pyfedpkg/initial_merge.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pyfedpkg/initial_merge.py b/src/pyfedpkg/initial_merge.py
index dc81c32..65de052 100755
--- a/src/pyfedpkg/initial_merge.py
+++ b/src/pyfedpkg/initial_merge.py
@@ -107,9 +107,9 @@ def do_initial_merge(into, to_merge):
pyfedpkg.switch_branch(into.localbranch)
repo = git.Repo()
print "Merging", [ x.origbranch for x in to_merge], "into", into.localbranch
- repo.git.merge(*(['-m', 'Initial peudo merge for dist-git setup',
- '-s', 'ours'] +
- [ x.origbranch for x in to_merge]))
+ repo.git.merge('-m', 'Initial peudo merge for dist-git setup',
+ '-s', 'ours',
+ *[x.origbranch for x in to_merge])
for t in to_merge:
pyfedpkg.switch_branch(t.localbranch)
print "Merging", into.localbranch, "into", t.localbranch