From 513c3e057632ec4efbccf66114d246edf79fd71e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 27 Jul 2016 07:44:47 +0100 Subject: [PATCH] fix compose ID naming for branched Signed-off-by: Peter Robinson --- nightly.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nightly.sh b/nightly.sh index 8276936..e22a386 100755 --- a/nightly.sh +++ b/nightly.sh @@ -22,7 +22,7 @@ RSYNCPREFIX="sudo -u ftpsync" ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX) ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/" ATOMICDEST="/mnt/koji/atomic/$BRANCHED/" -OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Rawhide/COMPOSE_ID) +OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Branched/COMPOSE_ID) # uncomment and edit for resuming a failed compose #COMPOSE_ID="Fedora-23-20150530.n.0" @@ -68,7 +68,7 @@ if [ "$?" = "0" ]; then export mail=0 fi -NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Rawhide/COMPOSE_ID) +NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Branched/COMPOSE_ID) SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID") fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")