summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-04-29 22:38:22 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-05-23 18:31:00 +0100
commit6b9163d64f17fb2f6b65a625569b2b847f121e00 (patch)
treeb65a12ebf75d1c84c505f09170eb45bc3b15c165
parent24899da1b7b4556ac31d72d2ddad383b5a5d93d2 (diff)
downloaddrakiso-6b9163d64f17fb2f6b65a625569b2b847f121e00.tar
drakiso-6b9163d64f17fb2f6b65a625569b2b847f121e00.tar.gz
drakiso-6b9163d64f17fb2f6b65a625569b2b847f121e00.tar.bz2
drakiso-6b9163d64f17fb2f6b65a625569b2b847f121e00.tar.xz
drakiso-6b9163d64f17fb2f6b65a625569b2b847f121e00.zip
Rename name_fields config value to iso_name_fields.
-rw-r--r--examples/minimal/config/build.cfg2
-rw-r--r--lib/MGA/DrakISO/ISOBuild.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg
index 4bc899d..b509b98 100644
--- a/examples/minimal/config/build.cfg
+++ b/examples/minimal/config/build.cfg
@@ -22,7 +22,7 @@ sub build_title {
my $default_append = 'root=mgalive:LABEL=' . build_label($build) . ' noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0';
my $config = {
- name_fields => [ qw(distro version product type arch) ],
+ iso_name_fields => [ qw(distro version product type arch) ],
system => {
enabled_media => [
'Core Release',
diff --git a/lib/MGA/DrakISO/ISOBuild.pm b/lib/MGA/DrakISO/ISOBuild.pm
index 0785062..84d8b20 100644
--- a/lib/MGA/DrakISO/ISOBuild.pm
+++ b/lib/MGA/DrakISO/ISOBuild.pm
@@ -38,7 +38,7 @@ sub new {
sub get_name {
my ($build) = @_;
- my $fields = $build->{name_fields} || $build->default_name_fields;
+ my $fields = $build->{iso_name_fields} || $build->default_name_fields;
join('-', grep { $_ } @{$build->{settings}}{@$fields});
}