From 57060f5254e48a9eead04426803d4f102f2b0a4b Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 9 Jan 2018 23:34:24 +0000
Subject: Miscellaneous code cleanup.

---
 lib/MGA/DrakISO/BuildMedia.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/MGA/DrakISO/BuildMedia.pm')

diff --git a/lib/MGA/DrakISO/BuildMedia.pm b/lib/MGA/DrakISO/BuildMedia.pm
index 5e75c1c..b2171b4 100644
--- a/lib/MGA/DrakISO/BuildMedia.pm
+++ b/lib/MGA/DrakISO/BuildMedia.pm
@@ -79,7 +79,7 @@ sub prepare_media {
 
     # Create a working directory to hold any temporary files we generate.
     # Nothing in this directory is needed after we exit this function.
-    mkdir_p($build->get_builddir('tmp'));
+    mkdir_p($build->get_build_dir('tmp'));
 
     prepare_urpmi_media($build);
     get_available_packages($build);
@@ -103,7 +103,7 @@ sub prepare_media {
     my $version = $build->{settings}{version};
     my $tag     = $build->{settings}{tag};
 
-    my $arch_dir = $build->get_builddir('files/' . $arch);
+    my $arch_dir = $build->get_build_dir('files/' . $arch);
 
     create_product_id($build, $arch_dir . '/product.id');
     create_index($build, $arch_dir . '/pkg-' . $version . '-' . $tag . '.idx');
@@ -127,7 +127,7 @@ sub prepare_urpmi_media {
     my %media;
 
     # Get a list of the currently configured media in our urpmi root.
-    my $list_file = $build->get_builddir('tmp') . '/media_url.lst';
+    my $list_file = $build->get_build_dir('tmp') . '/media_url.lst';
     run_urpm($build, "urpmq", "--list-url > $list_file");
     foreach my $line (cat_($list_file)) {
         chomp($line);
@@ -232,7 +232,7 @@ sub include_groups {
     # Use the distribution rpmsrate file to select and add packages in the
     # requested groups.
     my $rpmsrate_src = $build->{settings}{repository} . '/' . $build->{settings}{arch} . '/media/media_info/rpmsrate';
-    my $rpmsrate_tmp = $build->get_builddir('tmp') . '/rpmsrate';
+    my $rpmsrate_tmp = $build->get_build_dir('tmp') . '/rpmsrate';
     copy_or_link($rpmsrate_src, $rpmsrate_tmp);
     add_rated_packages($build, $rpmsrate_tmp);
     report_package_count();
@@ -439,7 +439,7 @@ sub build_installer_media {
 
     # Create a clean set of media directories
     my $arch = $build->{settings}{arch};
-    my $arch_dir = $build->get_builddir('files/' . $arch);
+    my $arch_dir = $build->get_build_dir('files/' . $arch);
     my $media_dir = $arch_dir . '/media/';
     rm_rf($media_dir) if -e $media_dir;
     mkdir_p($media_dir . 'media_info');
@@ -524,8 +524,8 @@ sub check_installer_media {
     print "Checking installer media [$class]\n" if $::verbose;
 
     my $arch = $build->{settings}{arch};
-    my $media_dir = $build->get_builddir('files/' . $arch . '/media');
-    my $log_file  = $build->get_builddir('tmp') . '/rpmcheck.log';
+    my $media_dir = $build->get_build_dir('files/' . $arch . '/media');
+    my $log_file  = $build->get_build_dir('tmp') . '/rpmcheck.log';
     system("zcat -q $media_dir/$class/media_info/hdlist.cz | rpmcheck -explain -failures > $log_file") == 0
       or die "ERROR: failed to run rpmcheck\n";
 
@@ -565,7 +565,7 @@ sub create_index {
 
     my $arch = $build->{settings}{arch};
 
-    my $media_dir = $build->get_builddir('files/' . $arch . '/media/');
+    my $media_dir = $build->get_build_dir('files/' . $arch . '/media/');
     my @hdlists = glob("$media_dir/*/media_info/hdlist.cz");
 
     my @tab;
-- 
cgit v1.2.1