From ee01aca88ae9db68ef97360ba5cad10e5a1e5141 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 1 Apr 2018 20:42:57 +0100 Subject: Fix --distrib option for additional media. --- lib/MGA/DrakISO/BuildRoot.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/MGA/DrakISO/BuildRoot.pm b/lib/MGA/DrakISO/BuildRoot.pm index 3462603..85aefab 100644 --- a/lib/MGA/DrakISO/BuildRoot.pm +++ b/lib/MGA/DrakISO/BuildRoot.pm @@ -500,13 +500,13 @@ sub customise_live_system { # Add additional media for installing RPMs not in the main repository. foreach (@{$build->{system}{additional_media}}) { run_in_root($root, undef, 'urpmi.addmedia', if_($::verbose < 2, '-q'), - if_($_->{distrib}, '--distrib'), $_->{name}, $_->{path}) + $_->{name}, $_->{path}) or die "ERROR: unable to add media from $_->{path}\n"; @{$_->{packages} || []} or next; run_in_root($root, $arch, 'urpmi', if_($::verbose < 3, '-q'), '--auto', '--no-verify-rpm', - if_(!$_->{distrib}, '--searchmedia', $_->{name}), @{$_->{packages}}) + if_($_->{name} ne '--distrib', '--searchmedia', $_->{name}), @{$_->{packages}}) or die "ERROR: unable to install packages from $_->{path}\n"; } -- cgit v1.2.1