From: Yaroslav Halchenko <debian@onerussian.com>
Date: Sat, 30 Oct 2010 16:39:12 +0000 (-0400)
Subject: RF+NF: deploy neurodebian apt key for nd+ cows
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=831caf300c37b508a1418e6c3504193f51a35b5b;p=neurodebian.git

RF+NF: deploy neurodebian apt key for nd+ cows
---

diff --git a/debian/control b/debian/control
index 9917fe2..f8014a7 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ XS-DM-Upload-Allowed: yes
 
 Package: neurodebian-dev
 Architecture: all
-Depends: ${misc:Depends}, devscripts, cowbuilder, python
+Depends: ${misc:Depends}, devscripts, cowbuilder, python, neurodebian-keyring
 Recommends: virtualbox-ose, virtualbox-ose-fuse, zerofree
 Suggests:
 Description: NeuroDebian development tools
diff --git a/tools/nd_adddist b/tools/nd_adddist
index 065173d..94bd35b 100755
--- a/tools/nd_adddist
+++ b/tools/nd_adddist
@@ -21,22 +21,27 @@ fi
 # common options
 opts="--distribution $dist --debootstrap debootstrap --aptcache $aptcache"
 
+mkdir -p ${cowbuilderroot}/cow
 
 for a in i386 amd64; do
   echo "Building $a base path..."
-  if [ -d ${cowbuilderroot}/cow/${family}-${dist}-${a}.cow ]; then
-    echo "${cowbuilderroot}/cow/${family}-${dist}-${a}.cow exists. Ignoring arch."
+  cow="${cowbuilderroot}/cow/${family}-${dist}-${a}.cow"
+  if [ -d "$cow" ]; then
+    echo "${cow} exists. Ignoring arch."
     continue
   fi
   if [ "${family:0:3}" = "nd+" ]; then
   echo "Including NeuroDebian repository..."
-    cowbuilder --create --basepath ${cowbuilderroot}/cow/${family}-${dist}-${a}.cow $opts \
+    cowbuilder --create --basepath ${cow} $opts \
                --components "$components" \
                --mirror "$mirror" \
                --debootstrapopts --arch --debootstrapopts $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
   else
-    cowbuilder --create --basepath ${cowbuilderroot}/cow/${family}-${dist}-${a}.cow $opts \
+    cowbuilder --create --basepath ${cow} $opts \
                --components "$components" \
                --mirror "$mirror" \
                --debootstrapopts --arch --debootstrapopts $a