From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RSXQW-00041e-8D for garchives@archives.gentoo.org; Mon, 21 Nov 2011 17:13:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C653021C020; Mon, 21 Nov 2011 17:12:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 81F7A21C020 for ; Mon, 21 Nov 2011 17:12:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9CA51B4018 for ; Mon, 21 Nov 2011 17:12:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DB12380042 for ; Mon, 21 Nov 2011 17:12:45 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <77f3354b73f386ee874c742e449924fac1ffd1e2.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/repoman/, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman pym/repoman/utilities.py X-VCS-Directories: pym/repoman/ bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 77f3354b73f386ee874c742e449924fac1ffd1e2 Date: Mon, 21 Nov 2011 17:12:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: bfb561d8-dfc8-4656-9537-70b6b9066963 X-Archives-Hash: 74edbb1828a038b4451e89d493078e89 commit: 77f3354b73f386ee874c742e449924fac1ffd1e2 Author: Zac Medico gentoo org> AuthorDate: Mon Nov 21 17:12:32 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Nov 21 17:12:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D77f3354b 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 =3D options.echangelog not in ('y', 'force') and vcs in = ('cvs', 'svn') =20 +logging.debug("vcs: %s" % (vcs,)) logging.debug("repo config: %s" % (repo_config,)) logging.debug("options: %s" % (options,)) =20 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 =3D seek() =20 + if len(outvcs) > 1: + # eliminate duplicates, like for svn in bug #391199 + outvcs =3D list(set(outvcs)) + return outvcs =20 _copyright_re1 =3D re.compile(br'^(# Copyright \d\d\d\d)-\d\d\d\d ')