From 4427b80aba6fe2de16d1403b86995d9761926100 Mon Sep 17 00:00:00 2001 From: Eric Bélanger Date: Tue, 13 Nov 2012 03:08:46 -0500 Subject: crossrepomove: Fix dbscripts path for [community] move to nymeria MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bélanger Signed-off-by: Pierre Schmitz --- crossrepomove.in | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/crossrepomove.in b/crossrepomove.in index a19e5f3..8794326 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -72,11 +72,23 @@ svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${targe pushd "target_checkout/${pkgbase}/trunk" >/dev/null archrelease "${arch[@]/#/$target_repo-}" || die popd >/dev/null -ssh "${target_server}" '/arch/db-update' || die + +if [[ "${target_server}" == "${community_server}" ]]; then + dbscripts_path='/srv/repos/svn-community/dbscripts' +else + dbscripts_path='/arch' +fi + +ssh "${target_server}" "${dbscripts_path}/db-update" || die msg "Removing ${pkgbase} from ${source_repo}" +if [[ "${source_server}" == "${community_server}" ]]; then + dbscripts_path='/srv/repos/svn-community/dbscripts' +else + dbscripts_path='/arch' +fi for _arch in ${arch[@]}; do - ssh "${source_server}" "/arch/db-remove ${source_repo} ${_arch} ${pkgbase}" + ssh "${source_server}" "${dbscripts_path}/db-remove ${source_repo} ${_arch} ${pkgbase}" done svn -q checkout -N "${source_svn}" source_checkout svn -q up "source_checkout/${pkgbase}" -- cgit v1.2.3-70-g09d2