summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2011-10-15 14:41:13 +0200
committerFabian Groffen <grobian@gentoo.org>2011-10-15 14:41:13 +0200
commit513445d8e36db3cc2c03e4c6ed3c357e0d6f15b6 (patch)
tree660f0a81ab2bf3994dd985ccb8af4e4c067233cb
parent0c1bbb316ce2e7e9608af78f5e2f5dea1c667af7 (diff)
downloadportage-513445d8e36db3cc2c03e4c6ed3c357e0d6f15b6.tar.gz
portage-513445d8e36db3cc2c03e4c6ed3c357e0d6f15b6.tar.bz2
portage-513445d8e36db3cc2c03e4c6ed3c357e0d6f15b6.zip
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.)
-rw-r--r--pym/repoman/utilities.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index 380f8edb5..79137036c 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -472,7 +472,7 @@ def FindVCS():
outvcs = []
def seek(depth = None):
- """ Seek for distributed VCSes. """
+ """ Seek for VCSes that have a top-level data directory only. """
retvcs = []
pathprep = ''
@@ -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')): # >=1.7
+ retvcs.append('svn')
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')
# If we already found one of 'level zeros', just take a quick look