Handle UUID mismatch by deleting working copy and checking out it again. Patch by...

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 251623c692556155292981e9fb24c3cbf1296eb4..f2e4971effec0541219b4b333c829d691588cae6 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.59 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.60 2011/12/27 22:40:50 neurogeek Exp $
+
+  27 Dec 2011; Jesus Rivero <neurogeek@gentoo.org> subversion.eclass:
+  Handle UUID mismatch by deleting working copy and checking out it again.
+  Patch by Arfrever.
 
   27 Dec 2011; Christian Faulhammer <fauli@gentoo.org> rox-0install.eclass,
   apache-2.eclass, common-lisp-common-2.eclass, gnustep-2.eclass,

diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
index e3dea23a9474e7d460c2821932655ee333667de6..2f7dae399ced8b6905c52d35f8e948c289c5ab78 100644 (file)
--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.71 2011/12/14 23:40:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.72 2011/12/27 22:40:50 neurogeek Exp $
 
 # @ECLASS: subversion.eclass
 # @MAINTAINER:
@@ -283,7 +283,25 @@ subversion_fetch() {
                fi
 
                if [[ -z ${esvn_up_freq} ]]; then
-                       if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
+                       if [[ ${ESVN_WC_UUID} != $(subversion__svn_info "${repo_uri}" "Repository UUID") ]]; then
+                               # UUID mismatch. Delete working copy and check out it again.
+                               einfo "subversion recheck out start -->"
+                               einfo "     old UUID: ${ESVN_WC_UUID}"
+                               einfo "     new UUID: $(subversion__svn_info "${repo_uri}" "Repository UUID")"
+                               einfo "     repository: ${repo_uri}${revision:+@}${revision}"
+
+                               rm -fr "${ESVN_PROJECT}" || die
+
+                               debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
+
+                               mkdir -m 775 -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
+                               cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
+                               if [[ -n "${ESVN_USER}" ]]; then
+                                       ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
+                               else
+                                       ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
+                               fi
+                       elif [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
                                einfo "subversion switch start -->"
                                einfo "     old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
                                einfo "     new repository: ${repo_uri}${revision:+@}${revision}"