Merge lp:~ssweeny/ubuntu/raring/pbuilder-scripts/pbuilder-scripts-fixes into lp:ubuntu/raring/pbuilder-scripts

[Scott Sweeny]

This branch fixes a couple of regressions from a previous (Canonical-internal) incarnation of this package.

Specifically when running 'pcreate foo' you should end up with ~/Projects/foo in your $HOME directory (LP: #1079316). Also, when PBUILDER_SRCDIR_FORMAT is set to "pkg" you should get an extra directory layer for that package when running 'pget'. (LP: #1079899)

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-06 20:02:39 +0000
+++ debian/changelog	2012-11-16 22:50:25 +0000
@@ -1,3 +1,11 @@
+pbuilder-scripts (19) raring; urgency=low
+
+  * pcreate: Create project directory to match the new chroot (LP: #1079316)
+  * pget: Correctly respond to the value of PBUILDER_SRCDIR_FORMAT 
+    (LP: #1079899) 
+
+ -- Scott Sweeny <[e-mail]>  Fri, 16 Nov 2012 16:31:59 -0500
+
 pbuilder-scripts (18) raring; urgency=low
 
   [ Mike Carifio ]

=== modified file 'pcreate'
--- pcreate	2012-07-25 15:59:43 +0000
+++ pcreate	2012-11-16 22:50:25 +0000
@@ -116,7 +116,9 @@
 	DEBOOTSTRAP_ARGS="--debootstrapopts --variant=buildd --debootstrapopts --arch=$ARCH"
 fi
 
-
+# Create the Project directory
+SRCDIR=${PBUILDER_SRCDIR:-$HOME/Projects}
+mkdir -p "$SRCDIR/$PROJ"
 
 # Now, we didn't tell pbuilder about the user's input sources.list.  We'll set
 # that up as an extra step below (this allows user to input https sources even

=== modified file 'pget'
--- pget	2012-07-25 15:59:43 +0000
+++ pget	2012-11-16 22:50:25 +0000
@@ -39,6 +39,9 @@
   ;;
 esac
 
+# Make sure the right source directory is present
+mkdir -p "$srcdir"
+
 uid=$(id -u)
 gid=$(id -g)