[Asterisk-code-review] build tools: Don't delete staging directory after every build (repotools[master])

[George Joseph]

George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/8880 )

Change subject: build_tools: Don't delete staging directory after every build
......................................................................

build_tools: Don't delete staging directory after every build

Change-Id: Id6665c6c1474c579f3bcad386c34335b260d8b33
---
M build_tools/make_stage
1 file changed, 8 insertions(+), 3 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved; Approved for Submit



diff --git a/build_tools/make_stage b/build_tools/make_stage
index f2ab484..b2dbcbb 100755
--- a/build_tools/make_stage
+++ b/build_tools/make_stage
@@ -58,9 +58,14 @@
 tarball=${package_dir}.tar.gz
 
 svn ls ${stagedir} &> /dev/null || svn mkdir --parents ${stagedir} -m "Create staging directory"
-rm -rf staging
-svn co ${stagedir} staging
-trap "rm -rf staging" EXIT
+if [ -d staging/.svn ] ; then
+	pushd staging
+	svn update
+	popd staging
+else
+	rm -rf staging &>/dev/null || :
+	svn co ${stagedir} staging
+fi
 
 cp ${tarball} staging/
 tar --strip-components=1 -xzf ${tarball} -O ${package_dir}/manifest.xml > staging/manifest${variant:+-${variant}}.xml

-- 
To view, visit https://gerrit.asterisk.org/8880
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6665c6c1474c579f3bcad386c34335b260d8b33
Gerrit-Change-Number: 8880
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180430/50fd097d/attachment.html>