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 1RF3Zj-0003NA-6o for garchives@archives.gentoo.org; Sat, 15 Oct 2011 12:42:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94AF521C09E; Sat, 15 Oct 2011 12:42:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6143A21C09E for ; Sat, 15 Oct 2011 12:42:43 +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 D83921B402A for ; Sat, 15 Oct 2011 12:42:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 43C8B80042 for ; Sat, 15 Oct 2011 12:42:42 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <513445d8e36db3cc2c03e4c6ed3c357e0d6f15b6.grobian@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/utilities.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 513445d8e36db3cc2c03e4c6ed3c357e0d6f15b6 Date: Sat, 15 Oct 2011 12:42:42 +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: X-Archives-Hash: ef858a2da7f99da6ba8111d2578d9f81 commit: 513445d8e36db3cc2c03e4c6ed3c357e0d6f15b6 Author: Fabian Groffen gentoo org> AuthorDate: Sat Oct 15 12:41:13 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Oct 15 12:41:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D513445d8 FindVCS: support Subversion 1.7 Since subversion 1.7, only a top-level .svn dir is used. Make FindVCS also deal with that. (Tested with repoman on Prefix SVN-based tree.) --- pym/repoman/utilities.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py index 380f8ed..7913703 100644 --- a/pym/repoman/utilities.py +++ b/pym/repoman/utilities.py @@ -472,7 +472,7 @@ def FindVCS(): outvcs =3D [] =20 def seek(depth =3D None): - """ Seek for distributed VCSes. """ + """ Seek for VCSes that have a top-level data directory only. """ retvcs =3D [] pathprep =3D '' =20 @@ -483,6 +483,8 @@ def FindVCS(): retvcs.append('bzr') if os.path.isdir(os.path.join(pathprep, '.hg')): retvcs.append('hg') + if os.path.isdir(os.path.join(pathprep, '.svn')): # >=3D1.7 + retvcs.append('svn') =20 if retvcs: break @@ -497,7 +499,7 @@ def FindVCS(): # Level zero VCS-es. if os.path.isdir('CVS'): outvcs.append('cvs') - if os.path.isdir('.svn'): + if os.path.isdir('.svn'): # <1.7 outvcs.append('svn') =20 # If we already found one of 'level zeros', just take a quick look