From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 21 Nov 2011 17:12:32 +0000 (-0800)
Subject: repoman: fix svn "abiguous workdir", bug #391199
X-Git-Tag: v2.2.0_alpha77
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77f3354b73f386ee874c742e449924fac1ffd1e2;p=portage.git

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

diff --git a/bin/repoman b/bin/repoman
index 42a615420..8f42a38d0 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 81fa5e7c7..c42c4c59d 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 ')