aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-02-11 01:40:04 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-02-11 01:40:04 +0000
commit0570a4adf898533ec592c7f12e4ca3fcafc6f85c (patch)
tree571f196c745b37b16312124eda1e8d680aa335aa
parentf7cc6ef843e42a968529839ad34ecce100676902 (diff)
downloadpaludis-0570a4adf898533ec592c7f12e4ca3fcafc6f85c.tar.gz
paludis-0570a4adf898533ec592c7f12e4ca3fcafc6f85c.tar.xz
Support darcs+file and svn+file syncers.
-rw-r--r--paludis/syncers/Makefile.am8
-rw-r--r--paludis/syncers/dodarcs.in3
-rw-r--r--paludis/syncers/dosvn.in4
3 files changed, 11 insertions, 4 deletions
diff --git a/paludis/syncers/Makefile.am b/paludis/syncers/Makefile.am
index 5d95470..8417b08 100644
--- a/paludis/syncers/Makefile.am
+++ b/paludis/syncers/Makefile.am
@@ -1,5 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ .keep docvs+ext docvs+pserver docvs+ssh dodarcs+http dodarcs+ssh dofile dogit dogit+file dogit+http dogit+ssh dorsync dosvn dosvn+http dosvn+https dosvn+ssh dotar+file dotar+ftp dotar+http
+CLEANFILES = *~ .keep docvs+ext docvs+pserver docvs+ssh dodarcs+file dodarcs+http dodarcs+ssh dofile dogit dogit+file dogit+http dogit+ssh dorsync dosvn dosvn+file dosvn+http dosvn+https dosvn+ssh dotar+file dotar+ftp dotar+http
SUBDIRS = .
.keep :
@@ -11,6 +11,7 @@ libexecprog_SCRIPTS = \
docvs+ext \
docvs+pserver \
docvs+ssh \
+ dodarcs+file \
dodarcs+http \
dodarcs+ssh \
dofile \
@@ -20,6 +21,7 @@ libexecprog_SCRIPTS = \
dogit+ssh \
dorsync \
dosvn \
+ dosvn+file \
dosvn+http \
dosvn+https \
dosvn+ssh \
@@ -47,13 +49,13 @@ AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
docvs+ext docvs+pserver docvs+ssh : docvs.in
cat $? > $@
-dodarcs+http dodarcs+ssh : dodarcs.in
+dodarcs+file dodarcs+http dodarcs+ssh : dodarcs.in
cat $? > $@
dogit dogit+file dogit+http dogit+ssh : dogit.in
cat $? > $@
dofile dorsync : dorsync.in
cat $? > $@
-dosvn dosvn+http dosvn+https dosvn+ssh : dosvn.in
+dosvn dosvn+file dosvn+http dosvn+https dosvn+ssh : dosvn.in
cat $? > $@
dotar+file dotar+ftp dotar+http : dotar.in
cat $? > $@
diff --git a/paludis/syncers/dodarcs.in b/paludis/syncers/dodarcs.in
index de28165..67e69a9 100644
--- a/paludis/syncers/dodarcs.in
+++ b/paludis/syncers/dodarcs.in
@@ -32,6 +32,8 @@ while [[ $# -gt 0 ]]; do
echo " URL syntax: darcs+ssh://[USERNAME[:PASSWORD]@]SERVER:/PATH"
elif [[ "${PROTO}" == darcs+http ]]; then
echo " URL syntax: darcs+http://[USERNAME[:PASSWORD]@]SERVER[:PORT]/PATH"
+ elif [[ "${PROTO}" == darcs+file ]]; then
+ echo " URL syntax: darcs+file:///PATH"
else
# darcs can handle any protocol as long as you define
# environment variables telling it how. The user can
@@ -75,6 +77,7 @@ elif [[ -z "${REMOTE}" ]]; then
exit 1
fi
+REMOTE="${REMOTE#darcs+file://}"
REMOTE="${REMOTE#darcs+ssh://}"
REMOTE="${REMOTE#darcs+}"
diff --git a/paludis/syncers/dosvn.in b/paludis/syncers/dosvn.in
index 7f2ff68..ba1490c 100644
--- a/paludis/syncers/dosvn.in
+++ b/paludis/syncers/dosvn.in
@@ -29,6 +29,8 @@ while [[ $# -gt 0 ]]; do
echo " URL syntax: svn+ssh://[USERNAME[:PASSWORD]@]SERVER:/PATH"
elif [[ "${PROTO}" == svn+http || "${PROTO}" == svn+https ]]; then
echo " URL syntax: ${PROTO}://[USERNAME[:PASSWORD]@]SERVER[:PORT]/PATH"
+ elif [[ "${PROTO}" == svn+file ]]; then
+ echo " URL syntax: svn+file:///PATH"
else
ewarn "URL syntax for ${PROTO} is unknown. This script will likely not work with the ${PROTO} protocol"
fi
@@ -64,7 +66,7 @@ elif [[ -z "${REMOTE}" ]]; then
exit 1
fi
-[[ "${REMOTE}" == svn+http* ]] && REMOTE="${REMOTE#svn+}"
+[[ "${REMOTE}" == svn+http* || "${REMOTE}" == svn+file://* ]] && REMOTE="${REMOTE#svn+}"
${SVN_WRAPPER} svn checkout "${SVN_CHECKOUT_OPTIONS[@]}" "${REMOTE}" "${LOCAL}/"