summaryrefslogtreecommitdiffstats
path: root/bin/repoman
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-01-29 18:49:58 +0000
committerZac Medico <zmedico@gentoo.org>2010-01-29 18:49:58 +0000
commit89163087db88fc5aa43bf5adfbbd9d983729e569 (patch)
treecc3db7cefc9b234c9968ef408c95fd72bf2d6c67 /bin/repoman
parentc965e9057de36b9fccbc63101acbe6050fbf09e4 (diff)
downloadportage-89163087db88fc5aa43bf5adfbbd9d983729e569.tar.gz
portage-89163087db88fc5aa43bf5adfbbd9d983729e569.tar.bz2
portage-89163087db88fc5aa43bf5adfbbd9d983729e569.zip
Fix Manifest commit logic for cvs and svn. Thanks to Rafael Martins
<rafael@rafaelmartins.com>. (trunk r15205) svn path=/main/branches/2.1.7/; revision=15258
Diffstat (limited to 'bin/repoman')
-rwxr-xr-xbin/repoman8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/repoman b/bin/repoman
index fd3c519a3..442fb83d8 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2485,12 +2485,12 @@ else:
commit_cmd.extend(vcs_global_opts)
commit_cmd.append("commit")
commit_cmd.extend(vcs_local_opts)
- if vcs in ('git', 'bzr'):
- commit_cmd.extend(["-F", commitmessagefile])
- commit_cmd.extend(f.lstrip("./") for f in myfiles)
- elif vcs == "hg":
+ if vcs == "hg":
commit_cmd.extend(["--logfile", commitmessagefile])
commit_cmd.extend(myfiles)
+ else:
+ commit_cmd.extend(["-F", commitmessagefile])
+ commit_cmd.extend(f.lstrip("./") for f in myfiles)
try:
if options.pretend: