summaryrefslogtreecommitdiffstats
path: root/lib/MGA/DrakISO/ISOBuild.pm
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-12-19 16:01:31 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-12-19 16:01:31 +0000
commit505bfb9a7ade6a916d7869605a4f7a292de22776 (patch)
tree9b64ce385e96bc069c8b83f5deda2d11ff05996d /lib/MGA/DrakISO/ISOBuild.pm
parent059b5c2a18e61cc7e4348e955025f9d77466647d (diff)
downloaddrakiso-505bfb9a7ade6a916d7869605a4f7a292de22776.tar
drakiso-505bfb9a7ade6a916d7869605a4f7a292de22776.tar.gz
drakiso-505bfb9a7ade6a916d7869605a4f7a292de22776.tar.bz2
drakiso-505bfb9a7ade6a916d7869605a4f7a292de22776.tar.xz
drakiso-505bfb9a7ade6a916d7869605a4f7a292de22776.zip
Replace $live by $build throughout,
Ready for adding support for classic installer builds.
Diffstat (limited to 'lib/MGA/DrakISO/ISOBuild.pm')
-rw-r--r--lib/MGA/DrakISO/ISOBuild.pm18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/MGA/DrakISO/ISOBuild.pm b/lib/MGA/DrakISO/ISOBuild.pm
index d3305fe..16fa36e 100644
--- a/lib/MGA/DrakISO/ISOBuild.pm
+++ b/lib/MGA/DrakISO/ISOBuild.pm
@@ -37,25 +37,25 @@ sub new {
}
sub get_name {
- my ($live) = @_;
- my $fields = $live->{name_fields} || $live->default_name_fields;
- join('-', grep { $_ } @{$live->{settings}}{@$fields});
+ my ($build) = @_;
+ my $fields = $build->{name_fields} || $build->default_name_fields;
+ join('-', grep { $_ } @{$build->{settings}}{@$fields});
}
sub get_set_suffix {
- my ($live) = @_;
- $live->{settings}{set} ? "-$live->{settings}{set}" : "";
+ my ($build) = @_;
+ $build->{settings}{set} ? "-$build->{settings}{set}" : "";
}
sub get_builddir {
- my ($live, $o_subdir) = @_;
- $live->{settings}{builddir} . '/' . $live->get_name . $live->get_set_suffix . if_($o_subdir, '/' . $o_subdir);
+ my ($build, $o_subdir) = @_;
+ $build->{settings}{builddir} . '/' . $build->get_name . $build->get_set_suffix . if_($o_subdir, '/' . $o_subdir);
}
sub get_absolute_path {
- my ($live, $path) = @_;
+ my ($build, $path) = @_;
if (defined $path && substr($path, 0, 1) ne '/') {
- $live->{settings}{config_root} . '/' . $path;
+ $build->{settings}{config_root} . '/' . $path;
} else {
$path;
}