From e6285e64a06d1c37235f1be201a75b164fbcf607 Mon Sep 17 00:00:00 2001
From: Alexander Stefanov <astefanov@virtuozzo.com>
Date: Wed, 3 Jul 2019 12:42:19 +0300
Subject: [PATCH] put pipestatus back, disable cache

---
 build-rpm.sh        | 8 ++++----
 config-generator.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-rpm.sh b/build-rpm.sh
index 7eb54c2..b862c60 100755
--- a/build-rpm.sh
+++ b/build-rpm.sh
@@ -290,15 +290,15 @@ do
 	    fi
 	fi
 	$MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package --no-cleanup-after --no-clean $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER
-#	rc=${PIPESTATUS[0]}
+	rc=${PIPESTATUS[0]}
 	python /mdv/check_arch.py "${OUTPUT_FOLDER}"/*.src.rpm ${platform_arch}
 	if [[ $? -ne 0 ]]; then exit 6; fi
     else
 	$MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package --no-cleanup-after $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER
 	if [[ $? -ne 0 ]]; then exit 1; fi
-#	rc=${PIPESTATUS[0]}
-#	python /mdv/check_arch.py "${OUTPUT_FOLDER}"/*.src.rpm ${platform_arch}
-#	if [[ $? -ne 0 ]]; then exit 6; fi
+	rc=${PIPESTATUS[0]}
+	python /mdv/check_arch.py "${OUTPUT_FOLDER}"/*.src.rpm ${platform_arch}
+	if [[ $? -ne 0 ]]; then exit 6; fi
     fi
 
     try_rebuild=false
diff --git a/config-generator.sh b/config-generator.sh
index c31a443..ad49dae 100755
--- a/config-generator.sh
+++ b/config-generator.sh
@@ -32,7 +32,7 @@ config_opts['urpm_options'] = '$extra_cfg_urpm_options'
 config_opts['root'] = '$platform_name-$platform_arch'
 config_opts['chroot_setup'] = 'basesystem-minimal basesystem-build xz timezone'
 #config_opts['urpm_options'] = '--xml-info=never $extra_cfg_urpm_options'
-config_opts['plugin_conf']['root_cache_enable'] = True
+config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['root_cache_opts']['age_check'] = True
 config_opts['plugin_conf']['root_cache_opts']['max_age_days'] = 1
 config_opts['plugin_conf']['ccache_enable'] = False