Merge lp:~agateau/pbuilder/pbuilder-hooks-own-repo-fixes into lp:~kubuntu-packagers/pbuilder/pbuilder-hooks

[Aurélien Gâteau]

Some fixes for the custom pool hook

Unmerged revisions

31. By Aurélien Gâteau on 2011-11-30

Fix typo (POOLDDIR => POOLDIR) and output a few informative messages.

30. By Aurélien Gâteau on 2011-11-30

Created repo is a trivial repo, the 'deb' line should only have two parameters

=== modified file 'D09custompool'
--- D09custompool	2010-12-13 20:47:00 +0000
+++ D09custompool	2011-11-30 17:06:26 +0000
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if [ $POOL ]; then
-    if [ -z $POOLDIR ]; then
-        POOLDDIR=/usr/src/deb/pool
+    if [ -z "$POOLDIR" ]; then
+        POOLDIR=/usr/src/deb/pool
     fi
 
     cd $POOLDIR
@@ -12,10 +12,11 @@
     fi
 
     d=`pwd`
-    echo $d
+    echo "POOLDIR=$d"
     grep "$d" /etc/apt/sources.list > /dev/null 2>&1
 
     if [ "$?" != "0" ]; then
+        echo "POOLDIR not found in /etc/apt/sources.list, adding it"
         echo "deb file:$d ./" >> /etc/apt/sources.list
         echo "APT::Get::AllowUnauthenticated 1;" >> /etc/apt/apt.conf.d/allow-unauthenticated
 

=== modified file 'README'
--- README	2010-09-02 20:03:33 +0000
+++ README	2011-11-30 17:06:26 +0000
@@ -58,7 +58,7 @@
     used above. IMHO it actually makes sense to write a script for post_upload.
 
   * Once all is set up properly you should be able to use
-      deb file:/usr/src/deb/pool/jaunty jaunty ./
+      deb file:/usr/src/deb/pool/jaunty ./
     to use your package pool. It makes sense to change pbuilder's sources.list
     (sudo pbuilder login --save-after-login). If you don't add it manually, the
     hook will add it every time again and run the scan to make sure the