From 8afd58bd94c0d98e29351e71d0a692574a38cb82 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 7 Dec 2019 13:57:25 +0100
Subject: [minilinux] Fix deleting orphaned/empty branches

---
 modules-available/minilinux/inc/minilinux.inc.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules-available/minilinux/inc/minilinux.inc.php b/modules-available/minilinux/inc/minilinux.inc.php
index 54536096..ca81eafa 100644
--- a/modules-available/minilinux/inc/minilinux.inc.php
+++ b/modules-available/minilinux/inc/minilinux.inc.php
@@ -71,11 +71,9 @@ class MiniLinux
 			WHERE sourceid = :sourceid AND taskid = :taskid",
 			['sourceid' => $sourceid, 'taskid' => $taskId]);
 		// Clean up -- delete orphaned versions that are not installed
-		$orphaned = Database::queryColumnArray('SELECT versionid FROM minilinux_version WHERE orphan > 4 AND installed = 0');
-		if (!empty($orphaned)) {
-			Database::exec('DELETE FROM minilinux_version WHERE versionid IN (:list)', ['list' => $orphaned]);
-		}
-		Database::exec('DELETE FROM minilinux_branch', [], true);
+		Database::exec('DELETE FROM minilinux_version WHERE orphan > 4 AND installed = 0');
+		// FKC makes sure we only delete orphaned ones
+		Database::exec('DELETE IGNORE FROM minilinux_branch WHERE 1', [], true);
 	}
 
 	private static function addBranches($sourceid, $systems)
-- 
cgit v1.2.3-55-g7522