diff options
| author | Simon Rettberg | 2019-12-07 13:58:07 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-12-07 13:58:07 +0100 |
| commit | ea01e0f82aefe38b9d08ddf2eeb6fc5f059dc2e1 (patch) | |
| tree | c24312046c8a9572819d5668b1ba9ce6d9b0e2c1 /modules-available/minilinux/inc/minilinux.inc.php | |
| parent | [statistics/rebootcontrol] Add WOL button to statistics module (diff) | |
| parent | [sysconfig] Display error if deleting config from database failed (diff) | |
| download | slx-admin-ea01e0f82aefe38b9d08ddf2eeb6fc5f059dc2e1.tar.gz slx-admin-ea01e0f82aefe38b9d08ddf2eeb6fc5f059dc2e1.tar.xz slx-admin-ea01e0f82aefe38b9d08ddf2eeb6fc5f059dc2e1.zip | |
Merge branch 'master' into wol
Diffstat (limited to 'modules-available/minilinux/inc/minilinux.inc.php')
| -rw-r--r-- | modules-available/minilinux/inc/minilinux.inc.php | 8 |
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) |