From 4ec2dce12b969d79640ec3b85da2483caa7df8ff Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 14 Sep 2011 19:56:10 -0400
Subject: [PATCH] Added support for diablo/trunk packaging split.

Change-Id: I1f7f0c353c8068b104c18e3bd2af53b9a351f90c
---
 ppa_script.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ppa_script.sh b/ppa_script.sh
index a4c9555f..8f298501 100755
--- a/ppa_script.sh
+++ b/ppa_script.sh
@@ -11,7 +11,10 @@ fi
 HUDSON=http://localhost:8080/
 VERSIONDIR=$HOME/versions
 PKGRECORDFILE=$VERSIONDIR/pkgversions
-BZR_BRANCH=${BZR_BRANCH:-lp:~openstack-ubuntu-packagers/$PROJECT/ubuntu}
+# We keep packaging for openstack trunk in lp:~o-u-p/$project/ubuntu
+# For a release (diablo, essex), it's in lp:~o-u-p/$project/$release
+OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-ubuntu}
+BZR_BRANCH=${BZR_BRANCH:-lp:~openstack-ubuntu-packagers/$PROJECT/${OPENSTACK_RELEASE}}
 PPAS=${PPAS:-ppa:$PROJECT-core/trunk}
 PACKAGING_REVNO=${PACKAGING_REVNO:--1}
 series=${series:-lucid}