From 0150baac373316db6b606c7e920ad6ca90a31e62 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sat, 26 Apr 2008 22:48:20 -0400 Subject: [PATCH] some cleanup of sx-build-release svn path=/trunk/packages/sipb-xen-dev/; revision=464 --- debian/changelog | 8 ++++++++ sx-build-release | 20 +++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 41fff65..8a3909a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sipb-xen-dev (15) unstable; urgency=low + + * Stop requiring the current directory to be in the checkout. + * Don't do unnecessary write operations + (hence prompt less often for a password.) + + -- Greg Price Sat, 26 Apr 2008 22:45:42 -0400 + sipb-xen-dev (14) unstable; urgency=low * Use the shallower directory structure. diff --git a/sx-build-release b/sx-build-release index 57abc26..bc79131 100755 --- a/sx-build-release +++ b/sx-build-release @@ -1,5 +1,5 @@ #!/bin/bash -svnuri=`svn info | sed -n 's/^Repository Root: //p'` +svnuri=`svn info /srv/checkout | sed -n 's/^Repository Root: //p'` set -e if [ $# -ne 1 ] ; then @@ -16,15 +16,25 @@ package=$1 svn export $svnuri/$package build-release/`basename $package` olddir=`pwd` cd build-release/`basename $package` + eval `perl '-F:\s+' -lane 'print $F[0]."=".$F[1] if /^Version|^Source|^Distribution/' \ <(dpkg-parsechangelog)` - dpkg-buildpackage -us -uc -rfakeroot -svn mkdir $svnuri/package_tags/$Source -m "Create package tags directory" ||true -svn cp $svnuri/$package $svnuri/package_tags/$Source/$Version -m "Tag $Version of $Source" + +if ! svn ls $svnuri/package_tags/$Source >/dev/null 2>&1; then + svn mkdir $svnuri/package_tags/$Source \ + -m "Create package tags directory" +fi +if ! svn ls $svnuri/package_tags/$Source/$Version >/dev/null 2>&1; then + svn cp $svnuri/$package $svnuri/package_tags/$Source/$Version \ + -m "Tag $Version of $Source" +else + echo "$(basename $0): tag already exists, not making again" +fi + cd .. - reprepro-env include $Distribution `pwd`/${Source}_*${Version}*.changes +reprepro-env include $Distribution `pwd`/${Source}_*${Version}*.changes cd $olddir rm -rf build-release -- 1.7.9.5