From 418f2a1914318b875608f810c1e44d6766a5fa71 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 28 Jul 2016 02:57:03 +0100 Subject: [PATCH] fix compose ID naming for branched properyly this time Signed-off-by: Peter Robinson --- nightly.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nightly.sh b/nightly.sh index 441ced2..272d35c 100755 --- a/nightly.sh +++ b/nightly.sh @@ -23,7 +23,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-Branched/COMPOSE_ID) +OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-25/COMPOSE_ID) # uncomment and edit for resuming a failed compose #COMPOSE_ID="Fedora-23-20150530.n.0" @@ -69,7 +69,7 @@ if [ "$?" = "0" ]; then export mail=0 fi -NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Branched/COMPOSE_ID) +NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-25/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")