diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-04-01 20:42:57 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-04-01 20:42:57 +0100 |
| commit | ee01aca88ae9db68ef97360ba5cad10e5a1e5141 (patch) | |
| tree | 1a91c762dcae2f6595bf5e3a7de67ad7b6f5adde /lib/MGA/DrakISO/BuildRoot.pm | |
| parent | f458bea71d726158be1dcdec9576fa8bca44fa80 (diff) | |
| download | drakiso-ee01aca88ae9db68ef97360ba5cad10e5a1e5141.tar drakiso-ee01aca88ae9db68ef97360ba5cad10e5a1e5141.tar.gz drakiso-ee01aca88ae9db68ef97360ba5cad10e5a1e5141.tar.bz2 drakiso-ee01aca88ae9db68ef97360ba5cad10e5a1e5141.tar.xz drakiso-ee01aca88ae9db68ef97360ba5cad10e5a1e5141.zip | |
Fix --distrib option for additional media.
Diffstat (limited to 'lib/MGA/DrakISO/BuildRoot.pm')
| -rw-r--r-- | lib/MGA/DrakISO/BuildRoot.pm | 4 |
1 files changed, 2 insertions, 2 deletions
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"; } |