From 7903b524d11ede79122ab9a464f211fd8daec7e1 Mon Sep 17 00:00:00 2001
From: nazunalika <label@rockylinux.org>
Date: Sat, 13 Nov 2021 22:43:11 -0700
Subject: [PATCH] fix up some things

---
 sync/common_8                         | 8 +++++++-
 sync/minor-release-sync-to-staging.sh | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sync/common_8 b/sync/common_8
index a61d9f5..babf24e 100644
--- a/sync/common_8
+++ b/sync/common_8
@@ -63,6 +63,13 @@ MODS=(
 
 # functions
 # Note, EL8 and EL9 may not be the same, do not put in 'common'
+function treeinfoSaver() {
+  BaseOSArch="${1}"
+  TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo"
+  PRISTINE_TREE="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo-pristine"
+  /bin/cp "${TREEINFO_VAR}" "${PRISTINE_TREE}"
+}
+
 function treeinfoFixer() {
   BaseOSArch="${1}"
   TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo"
@@ -134,7 +141,6 @@ from configparser import ConfigParser
 config = ConfigParser()
 config.read('${TREEINFO_VAR}')
 config.set('tree', 'variants', 'BaseOS,AppStream')
-config.add_section('variant-AppStream')
 config.set('variant-AppStream', 'id', 'AppStream')
 config.set('variant-AppStream', 'name', 'AppStream')
 config.set('variant-AppStream', 'type', 'variant')
diff --git a/sync/minor-release-sync-to-staging.sh b/sync/minor-release-sync-to-staging.sh
index fbc6a19..8eb39e8 100644
--- a/sync/minor-release-sync-to-staging.sh
+++ b/sync/minor-release-sync-to-staging.sh
@@ -87,6 +87,7 @@ for ARCH in "${ARCHES[@]}"; do
   echo "Ensuring treeinfo is correct"
   treeinfoModder "${ARCH}"
   treeinfoModderKickstart "${ARCH}"
+  treeinfoSaver "${ARCH}"
 done
 
 # sign all repos