| 1 |
commit: 77f3354b73f386ee874c742e449924fac1ffd1e2 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 21 17:12:32 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 21 17:12:32 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=77f3354b |
| 7 |
|
| 8 |
repoman: fix svn "abiguous workdir", bug #391199 |
| 9 |
|
| 10 |
--- |
| 11 |
bin/repoman | 1 + |
| 12 |
pym/repoman/utilities.py | 4 ++++ |
| 13 |
2 files changed, 5 insertions(+), 0 deletions(-) |
| 14 |
|
| 15 |
diff --git a/bin/repoman b/bin/repoman |
| 16 |
index 42a6154..8f42a38 100755 |
| 17 |
--- a/bin/repoman |
| 18 |
+++ b/bin/repoman |
| 19 |
@@ -654,6 +654,7 @@ if vcs is None: |
| 20 |
# TODO: shouldn't this just be switched on the repo, iso the VCS? |
| 21 |
check_changelog = options.echangelog not in ('y', 'force') and vcs in ('cvs', 'svn') |
| 22 |
|
| 23 |
+logging.debug("vcs: %s" % (vcs,)) |
| 24 |
logging.debug("repo config: %s" % (repo_config,)) |
| 25 |
logging.debug("options: %s" % (options,)) |
| 26 |
|
| 27 |
|
| 28 |
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py |
| 29 |
index 81fa5e7..c42c4c5 100644 |
| 30 |
--- a/pym/repoman/utilities.py |
| 31 |
+++ b/pym/repoman/utilities.py |
| 32 |
@@ -522,6 +522,10 @@ def FindVCS(): |
| 33 |
else: |
| 34 |
outvcs = seek() |
| 35 |
|
| 36 |
+ if len(outvcs) > 1: |
| 37 |
+ # eliminate duplicates, like for svn in bug #391199 |
| 38 |
+ outvcs = list(set(outvcs)) |
| 39 |
+ |
| 40 |
return outvcs |
| 41 |
|
| 42 |
_copyright_re1 = re.compile(br'^(# Copyright \d\d\d\d)-\d\d\d\d ') |
Archives