summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-12-07 13:57:25 +0100
committerSimon Rettberg2019-12-07 13:57:25 +0100
commit8afd58bd94c0d98e29351e71d0a692574a38cb82 (patch)
treeda927c8ab54cb71cd981ac4c348803418634ade6
parent[locationinfo] less lovely javascript more not so lovely php (diff)
downloadslx-admin-8afd58bd94c0d98e29351e71d0a692574a38cb82.tar.gz
slx-admin-8afd58bd94c0d98e29351e71d0a692574a38cb82.tar.xz
slx-admin-8afd58bd94c0d98e29351e71d0a692574a38cb82.zip
[minilinux] Fix deleting orphaned/empty branches
-rw-r--r--modules-available/minilinux/inc/minilinux.inc.php8
1 files 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)