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

diff --git a/bin/repoman b/bin/repoman
index 42a61542050f22f3137607d4d5330ca7ba780ba8..8f42a38d09d6c882b5d1f09c5188903d7bc8fdc3 100755 (executable)
--- 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 81fa5e7c7d42b619c4a146e1de3f34f2b5fbb88c..c42c4c59d61c1c1e356e4dcb21dde6cb63cb917a 100644 (file)
--- 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 ')