From 45e48488f46d4e6cb27df7048f97961d4febe19e Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Sep 11 2017 09:10:34 +0000
Subject: Fix broken deps e-mail header for future releases


Instead of having to add the `--treename` argument after each branching,
let the script compute it automatically.

Relates: https://pagure.io/pungi-fedora/issue/350
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

---

diff --git a/nightly.sh b/nightly.sh
index cdc45a3..11d7782 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -80,7 +80,14 @@ fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compos
 DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
 
 compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $TARGET_DIR/$NEWCOMPOSE_ID/
-/usr/share/mash/spam-o-matic $DESTDIR/compose/Everything/ >$DESTDIR/logs/depcheck
+# Figure out a version for broken deps e-mail that goes to package maintainers.
+# In Rawhide it's just rawhide, for branched versions we prepend F- to the number.
+if [ "$BRANCHED" = "rawhide" ]; then
+    TREENAME="$BRANCHED"
+else
+    TREENAME="F-$BRANCHED"
+fi
+/usr/share/mash/spam-o-matic --treename="$TREENAME" "$DESTDIR/compose/Everything/" >"$DESTDIR/logs/depcheck"
 
 [ -z "$ARCH" ] && {
 ./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log