Tiny fixes to backport-dsc

[neurodebian.git] / tools / nd_adddist

diff --git a/tools/nd_adddist b/tools/nd_adddist
index f5aa64d6d5ce3f9727f36f2b1b42efb6de2c0783..b4a3f21e85d507dd72d5a1fe4352c8377cd4fd74 100755 (executable)
--- a/tools/nd_adddist
+++ b/tools/nd_adddist
@@ -37,14 +37,29 @@ for a in i386 amd64; do
   fi
   if [ "${family:0:3}" = "nd+" ]; then
   echo "Including NeuroDebian repository..."
+    # If it has updates -- enable them
+    if wget -q -O/dev/null $mirror/dists/$dist-updates; then
+      updates_apt="deb $mirror $dist-updates $components |"
+      updates_apt+="#deb-src $mirror $dist-updates $components |"
+    else
+      updates_apt=""
+    fi
     cowbuilder --create --basepath ${cow} $opts \
                --components "$components" \
                --mirror "$mirror" \
                --debootstrapopts --arch=$a \
-               --othermirror "deb http://neuro.debian.net/debian $dist main contrib non-free"
-       # deploy our key manually since archive with package is not yet
-       # available at this point
-       cp --preserve=mode {,${cow}}/etc/apt/trusted.gpg.d/neurodebian-archive-keyring.gpg
+               --othermirror "${updates_apt}deb http://neuro.debian.net/debian $dist main contrib non-free"
+    # deploy our key manually since archive with package is not yet
+    # available at this point
+    mkdir -p ${cow}/etc/apt/trusted.gpg.d
+    cp --preserve=mode {,${cow}}/etc/apt/trusted.gpg.d/neurodebian-archive-keyring.gpg
+    # Old ubuntus might not have capability to read from that key yet,
+    # so we would need to manually add it
+    if [ $dist = 'karmic' ] || [ $dist = 'hardy' ]; then
+        chroot ${cow} bash -c "apt-get install -y --force-yes gnupg \
+        && /usr/bin/apt-key add /etc/apt/trusted.gpg.d/neurodebian-archive-keyring.gpg \
+        && /usr/bin/apt-get update"
+    fi
   else
     cowbuilder --create --basepath ${cow} $opts \
                --components "$components" \