Skip to content

Commit ba2938f

Browse files
committed
Remove plasma-discover ensuring flatpak is not transitively removed
1 parent b71a411 commit ba2938f

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/main/java/cf/maybelambda/fedora/Main.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,17 @@ static void run(String[] args, PostInstallUpdater updater) {
6666

6767
if (confirm(scanner, "Remove all DNF packages marked for removal?")) {
6868
List<String> filtered = promptForExclusions(dnfRemovePackages, scanner);
69-
String[] cmd = new String[filtered.size() + 4];
69+
String[] cmd = new String[filtered.size() + 5];
7070
cmd[0] = "sudo";
7171
cmd[1] = "dnf";
7272
cmd[2] = "remove";
7373
cmd[3] = "-y";
74+
cmd[4] = "--noautoremove";
7475
for (int i = 0; i < filtered.size(); i++) {
75-
cmd[4 + i] = filtered.get(i);
76+
cmd[5 + i] = filtered.get(i);
7677
}
7778
updater.runCommand(cmd);
79+
updater.runCommand(new String[]{"sudo", "dnf", "mark", "user", "flatpak"});
7880
updater.runCommand(new String[]{"sudo", "dnf", "autoremove", "-y"});
7981
}
8082

src/main/resources/dnf-remove.cf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ krdc
1313
krfb
1414
ktnef
1515
neochat
16+
plasma-discover
1617
plasma-welcome
1718
skanpage
1819
spectacle

src/test/java/cf/maybelambda/fedora/MainTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ class MainTests {
2121
"rpm --import",
2222
"dnf install -y repo1",
2323
"dnf --refresh install -y pkg1",
24-
"dnf remove -y pkg2",
24+
"dnf remove -y --noautoremove pkg2",
25+
"dnf mark user flatpak",
2526
"dnf autoremove",
2627
"flatpak remote-add",
2728
"flatpak install -y flathub flatpak1",

0 commit comments

Comments
 (0)