[Da-tools-commits] ./debian/userdir-ldap r399: ud-replicate: Also support the imposter dchroot-dsa from the debian archive [aba]

[Peter Palfrader]

------------------------------------------------------------
revno: 399
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Sat 2008-05-17 11:22:00 +0200
message:
  ud-replicate: Also support the imposter dchroot-dsa from the debian archive [aba]
modified:
  debian/changelog
  ud-replicate
    ------------------------------------------------------------
    revno: 349.2.41
    committer: Andreas Barth <aba at not.so.argh.org>
    branch nick: userdir-ldap-common
    timestamp: Fri 2008-05-16 17:34:58 +0000
    message:
      Add compatibility to dchroot-dsa to ud-replicate
    modified:
      debian/changelog
      ud-replicate
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-17 09:18:45 +0000
+++ b/debian/changelog	2008-05-17 09:22:00 +0000
@@ -1,8 +1,10 @@
 userdir-ldap (0.3.XX) Xnstable; urgency=low
 
   * ud-mailgate: better regex for ssh1 keys, which we reject. [joerg, weasel]
+  * ud-replicate: Also support the imposter dchroot-dsa from the debian
+    archive. [aba, weasel]
 
- -- Peter Palfrader <weasel at debian.org>  Sat, 17 May 2008 11:18:27 +0200
+ -- Peter Palfrader <weasel at debian.org>  Sat, 17 May 2008 11:20:06 +0200
 
 userdir-ldap (0.3.23) unstable; urgency=low
 

=== modified file 'ud-replicate'
--- a/ud-replicate	2008-05-13 20:09:02 +0000
+++ b/ud-replicate	2008-05-17 09:22:00 +0000
@@ -68,8 +68,13 @@
 ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
+CHROOTS=""
 if [ -x /usr/bin/dchroot ]; then
 	CHROOTS=`dchroot --listpaths`
+elif [ -x /usr/bin/dchroot-dsa ]; then
+	CHROOTS=$(dchroot-dsa -i | grep Location | awk '{print $2}')
+fi
+if [ -n "$CHROOTS" ]; then
 	for c in $CHROOTS; do
 		if [ -x "$c/usr/bin/makedb" ]
 		then