Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15257 - main/branches/2.1.7/bin
Date: Fri, 29 Jan 2010 18:49:55
Message-Id: E1Navue-0007Dv-NU@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-01-29 18:49:48 +0000 (Fri, 29 Jan 2010)
3 New Revision: 15257
4
5 Modified:
6 main/branches/2.1.7/bin/repoman
7 Log:
8 Invert some vcs conditionals that are specific to cvs and svn. (trunk r15204)
9
10 Modified: main/branches/2.1.7/bin/repoman
11 ===================================================================
12 --- main/branches/2.1.7/bin/repoman 2010-01-29 18:49:38 UTC (rev 15256)
13 +++ main/branches/2.1.7/bin/repoman 2010-01-29 18:49:48 UTC (rev 15257)
14 @@ -492,7 +492,7 @@
15 vcs_local_opts = repoman_settings.get("REPOMAN_VCS_LOCAL_OPTS", "").split()
16 vcs_global_opts = repoman_settings.get("REPOMAN_VCS_GLOBAL_OPTS")
17 if vcs_global_opts is None:
18 - if vcs not in ("git", "bzr", "hg"):
19 + if vcs in ('cvs', 'svn'):
20 vcs_global_opts = "-q"
21 else:
22 vcs_global_opts = ""
23 @@ -2223,7 +2223,7 @@
24 commitmessage += ", RepoMan options: --force"
25 commitmessage += ")"
26
27 - if vcs not in ['git', 'bzr', 'hg'] and (myupdates or myremoved):
28 + if vcs in ('cvs', 'svn') and (myupdates or myremoved):
29 myfiles = myupdates + myremoved
30 if not myheaders and "sign" not in repoman_settings.features:
31 myfiles += mymanifests
32 @@ -2316,7 +2316,7 @@
33 write_atomic(x, "".join(mylines))
34
35 manifest_commit_required = True
36 - if vcs not in ['git', 'bzr', 'hg'] and (myupdates or myremoved):
37 + if vcs in ('cvs', 'svn') and (myupdates or myremoved):
38 myfiles = myupdates + myremoved
39 for x in range(len(myfiles)-1, -1, -1):
40 if myfiles[x].count("/") < 4-repolevel: