Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15258 - main/branches/2.1.7/bin
Date: Fri, 29 Jan 2010 18:50:05
Message-Id: E1Navuo-0007HH-Io@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-01-29 18:49:58 +0000 (Fri, 29 Jan 2010)
3 New Revision: 15258
4
5 Modified:
6 main/branches/2.1.7/bin/repoman
7 Log:
8 Fix Manifest commit logic for cvs and svn. Thanks to Rafael Martins
9 <rafael@×××××××××××××.com>. (trunk r15205)
10
11 Modified: main/branches/2.1.7/bin/repoman
12 ===================================================================
13 --- main/branches/2.1.7/bin/repoman 2010-01-29 18:49:48 UTC (rev 15257)
14 +++ main/branches/2.1.7/bin/repoman 2010-01-29 18:49:58 UTC (rev 15258)
15 @@ -2485,12 +2485,12 @@
16 commit_cmd.extend(vcs_global_opts)
17 commit_cmd.append("commit")
18 commit_cmd.extend(vcs_local_opts)
19 - if vcs in ('git', 'bzr'):
20 + if vcs == "hg":
21 + commit_cmd.extend(["--logfile", commitmessagefile])
22 + commit_cmd.extend(myfiles)
23 + else:
24 commit_cmd.extend(["-F", commitmessagefile])
25 commit_cmd.extend(f.lstrip("./") for f in myfiles)
26 - elif vcs == "hg":
27 - commit_cmd.extend(["--logfile", commitmessagefile])
28 - commit_cmd.extend(myfiles)
29
30 try:
31 if options.pretend: