From a35ab99236197fe705f3c31a2b5cf9299cc30573 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 23 Aug 2016 16:31:54 +0200
Subject: [PATCH] create_test_dvd: Invalidate .kiwi file in case of detected
 problems

---
 create_test_dvds.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/create_test_dvds.sh b/create_test_dvds.sh
index 4ef5715a..f1dc6deb 100755
--- a/create_test_dvds.sh
+++ b/create_test_dvds.sh
@@ -71,8 +71,10 @@ function regenerate_pl() {
 
     out=$(mktemp)
     testsolv -r $tcfile > $out
+    ERRPKG=""
     if grep ^problem $out ; then
-         return
+         # invalidate the kiwi file - ensuring it is not being built while we can't calculate it
+         ERRPKG="CREATE_TEST_DVD_PROBLEM"
     fi
     sed -i -e 's,^install \(.*\)-[^-]*-[^-]*\.[^-\.]*@.*,\1,' $out
     
@@ -86,7 +88,7 @@ function regenerate_pl() {
     osc up
     popd > /dev/null
     sed -n -e '1,/BEGIN-PACKAGELIST/p' $tdir/PRODUCT-$arch.kiwi > $p
-    for i in $(cat $out); do
+    for i in $(cat $out) $ERRPKG; do
 	echo "<repopackage name='$i'/>" >> $p
     done
     sed -n -e '/END-PACKAGELIST/,$p' $tdir/PRODUCT-$arch.kiwi >> $p