From 505bfb9a7ade6a916d7869605a4f7a292de22776 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Tue, 19 Dec 2017 16:01:31 +0000 Subject: Replace $live by $build throughout, Ready for adding support for classic installer builds. --- lib/MGA/DrakISO/ISOBuild.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/MGA/DrakISO/ISOBuild.pm') 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; } -- cgit v1.2.1