aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2010-01-17 18:15:28 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2010-01-17 18:15:28 +0000
commitc826920f872e41ced1b339c6f21b23f83f57f59d (patch)
tree92efdd4f45a721046e8c4a56baf91fc7c1a576cf
parent84e305568bd5066e6647c9ea3e3f313aaff41aab (diff)
downloadpaludis-c826920f872e41ced1b339c6f21b23f83f57f59d.tar.gz
paludis-c826920f872e41ced1b339c6f21b23f83f57f59d.tar.xz
Support bzr+lp:// for syncing
-rw-r--r--paludis/syncers/Makefile.am5
-rw-r--r--paludis/syncers/dobzr.in3
-rwxr-xr-xruby/demos/playman.rb2
3 files changed, 8 insertions, 2 deletions
diff --git a/paludis/syncers/Makefile.am b/paludis/syncers/Makefile.am
index 727f355..07b3526 100644
--- a/paludis/syncers/Makefile.am
+++ b/paludis/syncers/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/common-makefile.am
-CLEANFILES += +*~ .keep dobzr dobzr+aftp dobzr+file dobzr+ftp dobzr+http dobzr+https dobzr+sftp \
+CLEANFILES += +*~ .keep dobzr dobzr+aftp dobzr+file dobzr+ftp dobzr+http dobzr+https dobzr+lp dobzr+sftp \
dobzr+ssh docvs+ext docvs+pserver docvs+ssh dodarcs+file dodarcs+http dodarcs+https \
dodarcs+ssh dofile dogit dogit+file dogit+http dogit+https dogit+rsync dogit+ssh \
dohg+file dohg+http dohg+https dohg+ssh dohg+static-http dorsync dorsync+ssh dosvn \
@@ -19,6 +19,7 @@ libexecprog_SCRIPTS = \
dobzr+ftp \
dobzr+http \
dobzr+https \
+ dobzr+lp \
dobzr+sftp \
dobzr+ssh \
docvs+ext \
@@ -64,7 +65,7 @@ check_PROGRAMS = $(TESTS)
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-dobzr dobzr+aftp dobzr+file dobzr+ftp dobzr+http dobzr+https dobzr+sftp dobzr+ssh : dobzr.in
+dobzr dobzr+aftp dobzr+file dobzr+ftp dobzr+http dobzr+https dobzr+lp dobzr+sftp dobzr+ssh : dobzr.in
cat $? > $@
docvs+ext docvs+pserver docvs+ssh : docvs.in
cat $? > $@
diff --git a/paludis/syncers/dobzr.in b/paludis/syncers/dobzr.in
index 23f8267..1337c42 100644
--- a/paludis/syncers/dobzr.in
+++ b/paludis/syncers/dobzr.in
@@ -41,6 +41,8 @@ while [[ $# -gt 0 ]]; do
echo " URL syntax: ${PROTO}://[USERNAME[:PASSWORD]@]SERVER/PATH"
elif [[ "${PROTO}" == bzr+http || "${PROTO}" == bzr+https ]]; then
echo " URL syntax: ${PROTO}://[USERNAME[:PASSWORD]@]SERVER[:PORT]/PATH"
+ elif [[ "${PROTO}" == bzr+lp ]]; then
+ echo " URL syntax: ${PROTO}://PROJECT"
else
ewarn "URL syntax for ${PROTO} is unknown. This script will likely not work with the ${PROTO} protocol"
fi
@@ -79,6 +81,7 @@ elif [[ -z "${REMOTE}" ]]; then
fi
[[ "${REMOTE}" != bzr+ssh://* ]] && REMOTE="${REMOTE#bzr+}"
+[[ "${REMOTE}" == lp://* ]] && REMOTE="lp:${REMOTE#lp://}"
if [[ -d "${LOCAL}" && ! -d "${LOCAL}/.bzr" ]]; then
eerror "'${LOCAL}' exists but it is not a Bzr repository"
diff --git a/ruby/demos/playman.rb b/ruby/demos/playman.rb
index 8bae674..94fb660 100755
--- a/ruby/demos/playman.rb
+++ b/ruby/demos/playman.rb
@@ -175,6 +175,8 @@ def munge_url(type, src, subpath = "")
return src
when %r{^[a-z+]+://}
return "bzr+#{src}"
+ when %r{^lp:(.*)}
+ return "bzr+lp://#$1"
else
return "bzr+file://#{src}"
end