[gentoo-commits] proj/portage:master commit in: pym/repoman/, bin/

["Zac Medico" <zmedico@gentoo.org>]

commit:     77f3354b73f386ee874c742e449924fac1ffd1e2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 17:12:32 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 17:12:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=77f3354b

repoman: fix svn "abiguous workdir", bug #391199

---
 bin/repoman              |    1 +
 pym/repoman/utilities.py |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/bin/repoman b/bin/repoman
index 42a6154..8f42a38 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -654,6 +654,7 @@ if vcs is None:
 # TODO: shouldn't this just be switched on the repo, iso the VCS?
 check_changelog = options.echangelog not in ('y', 'force') and vcs in ('cvs', 'svn')
 
+logging.debug("vcs: %s" % (vcs,))
 logging.debug("repo config: %s" % (repo_config,))
 logging.debug("options: %s" % (options,))
 

diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index 81fa5e7..c42c4c5 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -522,6 +522,10 @@ def FindVCS():
 	else:
 		outvcs = seek()
 
+	if len(outvcs) > 1:
+		# eliminate duplicates, like for svn in bug #391199
+		outvcs = list(set(outvcs))
+
 	return outvcs
 
 _copyright_re1 = re.compile(br'^(# Copyright \d\d\d\d)-\d\d\d\d ')