Merge remote-tracking branch 'neurodebian-vm/master'

* neurodebian-vm/master:
  BF: some bugfixes for nd_build_testrdepends
  tools/nd_rebuildarchive - update for the target release not raring all the time

Conflicts:
	tools/nd_fetch_bdepends -- comments

diff --git a/tools/nd_build_testrdepends b/tools/nd_build_testrdepends
index 307f69b854389a5d545cf8bb1e2336a5922800d8..28a820d88d4ebd77ee45828db68fa341043fbc8d 100755 (executable)
--- a/tools/nd_build_testrdepends
+++ b/tools/nd_build_testrdepends
@@ -28,9 +28,12 @@ srcdir=$testdir/srcs
 oldbuildsdir=$srcdir/old
 newbuildsdir=$srcdir/new
 
-echo "I: Building the new package for $pkg"
+echo "I: Updating target chroot $family $dist"
+$CMD nd_updatedist $family $dist $arch
 
 mkdir -p $debdir $srcdir $bindir $secdir
+
+echo "I: Building the new package for $pkg"
 $CMD nd_build $family $dist $arch $dscfile --buildresult=$debdir
 
 echo "I: Initiating the repository"

diff --git a/tools/nd_fetch_bdepends b/tools/nd_fetch_bdepends
index 0a87390cbc58750b54147e2dfca1a8b13dbccf77..f769de17378aaf19fd3abfa36bcbc5baa42beadc 100755 (executable)
--- a/tools/nd_fetch_bdepends
+++ b/tools/nd_fetch_bdepends
@@ -19,6 +19,7 @@ apt-get install -y devscripts dctrl-tools
 rm -f build-rdeps.output
 echo "D: querying rdepds for $@"
 
+# D: interactive shell for debugging
 # /bin/bash < /dev/tty > /dev/tty 2> /dev/tty
 
 for pkg in "$@"; do

diff --git a/tools/nd_rebuildarchive b/tools/nd_rebuildarchive
index 0b8cafe84618083dceb19161d5840c24dd26e1ad..e41cfc7952a293ee86a60949947fcc136abcef74 100755 (executable)
--- a/tools/nd_rebuildarchive
+++ b/tools/nd_rebuildarchive
@@ -92,7 +92,7 @@ mv `awk '{print $1,$2;}' up-to-date-list.txt | while read p v; do grep -l "${p}_
 /home/neurodebian/reprepro/nd_processincoming.sh
 
 # locally now updated the cows
-sudo nd_updatedist nd+ubuntu precise
+sudo nd_updatedist nd+ubuntu $dist
 
 # And build which previously failed, most probably due to unsatisfied dependencies
 # and possibly failure with outdated versions of 3rd party modules