From fa803b03e768925428a719c7b1825e7bf7bb9f11 Mon Sep 17 00:00:00 2001
From: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Date: Mon, 15 Feb 2016 12:13:05 +0100
Subject: [PATCH] Networking-BGPVPN Fixing stable/liberty branch

While the time the patch
https://review.openstack.org/#/c/274552/2
Is not added yet this commit will guarantee
that the stable/liberty branch is
deployable.

Change-Id: Ic3ed7fea4dcbf2e76e6fa9195b29c9f06ac798e4
---
 pre_build_hook | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pre_build_hook b/pre_build_hook
index 663263e..6e6f578 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -23,6 +23,14 @@ function cleanup {
   rm -rf "${TMP_DIR}"
 }
 
+function patch_bgpvpn {
+  # test if patch is needed
+  git fetch ssh://enikher@review.openstack.org:29418/openstack/networking-bgpvpn refs/changes/52/274552/2 && git format-patch -1 --stdout FETCH_HEAD > ./odl-client-patch
+  patch -p1 -N --dry-run < ./odl-client-patch && patch -p1 -N < ./odl-client-patch || true
+
+  sed -i -- 's/sphinxcontrib-blockdiag//' ./requirements.txt
+  sed -i -- 's/sphinxcontrib-seqdiag//' ./requirements.txt
+}
 function build_pkg {
   case $1 in
     ubuntu)
@@ -59,8 +67,7 @@ pushd $TMP_DIR
 git clone $NETWORKING_BGPVPN_REPO networking-bgpvpn
 pushd networking-bgpvpn
 git checkout $NETWORKING_BGPVPN_BRANCH
-sed -i -- 's/sphinxcontrib-blockdiag//' ./requirements.txt
-sed -i -- 's/sphinxcontrib-seqdiag//' ./requirements.txt
+patch_bgpvpn
 popd
 git clone $NETWORKING_ODL_REPO networking_odl
 pushd networking_odl