Skip to content

Commit 42a4d33

Browse files
committed
Fix not to allow skipping broken on Grade A OS #116
1 parent ac33115 commit 42a4d33

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

virtualmin-install.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,12 +1497,16 @@ install_virtualmin_release() {
14971497
fi
14981498
fi
14991499
package_type="rpm"
1500+
allow_skip_broken=" --skip-broken"
1501+
if [ "$unstable" != 'unstable' ]; then
1502+
allow_skip_broken=""
1503+
fi
15001504
if command -pv dnf 1>/dev/null 2>&1; then
15011505
install_cmd="dnf"
15021506
install="$install_cmd -y install"
15031507
upgrade="$install_cmd -y update"
15041508
update="$install_cmd clean all ; $install_cmd makecache"
1505-
install_group_opts="-y --quiet --skip-broken group install --setopt=group_package_types=mandatory,default"
1509+
install_group_opts="-y --quiet$allow_skip_broken group install --setopt=group_package_types=mandatory,default"
15061510
install_group="$install_cmd $install_group_opts"
15071511
install_config_manager="$install_cmd config-manager"
15081512
# Do not use package manager when fixing repos
@@ -1520,7 +1524,7 @@ install_virtualmin_release() {
15201524
run_ok "$install_cmd --quiet groups mark convert" "Updating groups metadata"
15211525
fi
15221526
fi
1523-
install_group_opts="-y --quiet --skip-broken groupinstall --setopt=group_package_types=mandatory,default"
1527+
install_group_opts="-y --quiet$allow_skip_broken groupinstall --setopt=group_package_types=mandatory,default"
15241528
install_group="$install_cmd $install_group_opts"
15251529
install_config_manager="yum-config-manager"
15261530
fi

0 commit comments

Comments
 (0)