From cfd33caeb89fdb0fb3b88c351ae5994a4c55f66d Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 6 Sep 2012 17:40:07 +0200 Subject: [PATCH] I think this doesnt work, but not sure, so lets try --- debian_build.py | 2 +- liveboot_build.sh | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/debian_build.py b/debian_build.py index b17bb69..5d8cbd0 100755 --- a/debian_build.py +++ b/debian_build.py @@ -471,7 +471,7 @@ if __name__ == '__main__': # let me see the whole changelog now: for line in fileinput.input('debian/changelog'): - logger.debug('debian/changelog: %s' %(line.strip())) + print('debian/changelog: %s' %(line.strip())) # set pb_suite which GitBuildPackage() will turn into PB_SUITE # if we wrote a changelog entry, use that one diff --git a/liveboot_build.sh b/liveboot_build.sh index 805944b..58d4143 100755 --- a/liveboot_build.sh +++ b/liveboot_build.sh @@ -13,11 +13,8 @@ export PB_SUITE=production-proposed-updates # # Define default settings # -RSYNC_BASE=/srv/mirror/liveboot -# BUILD_DATE=${BUILD_DATE:=$(date +%Y%m%d%H%M)} -# BUILD_ID="${LIVE_TYPE}-${BUILD_DATE}-${BUILD_NUMBER}" # BUILD_ID is used without lb_build.sh... -# BUILD_TARGET=$RSYNC_BASE/$BUILD_ID - +RSYNC_SRC=/srv/mirror/liveboot +RSYNC_FILTER='' # # Overwrite settings depending on profile used @@ -37,12 +34,13 @@ RSYNC_BASE=/srv/mirror/liveboot #esac # WORK IN PROGRESS -RSYNC_SRC="$RSYNC_BASE/" -RSYNC_DST="liveboot@riserver/liveboot/" -RSYNC_FILTER='' +# ri server +RSYNC_DST1="liveboot@riserver/liveboot/" +# pbb +RSYNC_DST2="liveboot@10.254.1.1/livebuild/" -figlet "this is work in progress" +figlet "still work in progress, but... getting there" BUILD_SCRIPT=$(mktemp) @@ -70,8 +68,10 @@ sudo rm liveboot -Rf # Mirror # echo -echo "Now rsyncing results to $RSYNC_BASE ..." -rsync --password-file /etc/rsynclivebuild-send.pass -avv --delete --delete-excluded $RSYNC_FILTER $RSYNC_SRC/ rsync://$RSYNC_DST && figlet "mirror OK" +echo "Now rsyncing results to $RSYNC_DST1 ..." +rsync --password-file /etc/rsynclivebuild-send.pass -avv --delete --delete-excluded $RSYNC_FILTER $RSYNC_SRC/ rsync://$RSYNC_DST1 && figlet "mirror OK" +echo "Now rsyncing results to $RSYNC_DST1 ..." +rsync --password-file /etc/rsynclivebuild-send.pass -avv --delete --delete-excluded $RSYNC_FILTER $RSYNC_SRC/ rsync://$RSYNC_DST2 && figlet "mirror OK" # # cleanup /srv/mirror, keep MAX number of images -- 2.39.5