diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-11-21 09:12:32 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-11-21 09:12:32 -0800 |
| commit | 77f3354b73f386ee874c742e449924fac1ffd1e2 (patch) | |
| tree | 3b5ec1ed478df77c5e0833e3f3017a5ed927e030 | |
| parent | 3d6472165f306344b768367982758f1a3d33e921 (diff) | |
| download | portage-77f3354b73f386ee874c742e449924fac1ffd1e2.tar.gz portage-77f3354b73f386ee874c742e449924fac1ffd1e2.tar.bz2 portage-77f3354b73f386ee874c742e449924fac1ffd1e2.zip | |
repoman: fix svn "abiguous workdir", bug #391199v2.2.0_alpha77
| -rwxr-xr-x | bin/repoman | 1 | ||||
| -rw-r--r-- | pym/repoman/utilities.py | 4 |
2 files changed, 5 insertions, 0 deletions
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 ') |