summaryrefslogtreecommitdiffstats
path: root/lib/MGA/DrakISO/BuildMedia.pm
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-04 12:30:38 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-04 12:31:48 +0000
commit04e2b14c395ede7933addb7c4c68e1eca35468c8 (patch)
treeaf1ab2715e11d3003e59bfec0e0da440899b42fc /lib/MGA/DrakISO/BuildMedia.pm
parent0a90f0baf2b522b2c74278e0e7dcd3e3ff97bca5 (diff)
downloaddrakiso-04e2b14c395ede7933addb7c4c68e1eca35468c8.tar
drakiso-04e2b14c395ede7933addb7c4c68e1eca35468c8.tar.gz
drakiso-04e2b14c395ede7933addb7c4c68e1eca35468c8.tar.bz2
drakiso-04e2b14c395ede7933addb7c4c68e1eca35468c8.tar.xz
drakiso-04e2b14c395ede7933addb7c4c68e1eca35468c8.zip
Improved documentation and error messages.
Diffstat (limited to 'lib/MGA/DrakISO/BuildMedia.pm')
-rw-r--r--lib/MGA/DrakISO/BuildMedia.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/MGA/DrakISO/BuildMedia.pm b/lib/MGA/DrakISO/BuildMedia.pm
index 31b1f1c..8fe59bd 100644
--- a/lib/MGA/DrakISO/BuildMedia.pm
+++ b/lib/MGA/DrakISO/BuildMedia.pm
@@ -17,7 +17,7 @@
# SYNOPSIS
# --------
-# This module provides functions to create the installation media that will
+# This package provides a function to create the installation media that will
# be used by the classic installer and to collect together the various other
# files that are needed on the installer ISO.
@@ -70,6 +70,10 @@ my @excluded;
# Main Code
###############################################################################
+# This is the top-level function called to prepare the installation media
+# and other files required by the installer. It is independent of any other
+# preparatory step.
+#
sub prepare_media {
my ($build) = @_;
@@ -104,6 +108,8 @@ sub prepare_media {
create_product_id($build, $arch_dir . '/product.id');
create_index($build, $arch_dir . '/pkg-' . $version . '-' . $tag . '.idx');
+ # We don't expect this function to be called twice, but clean up
+ # nonetheless.
undef $urpm;
undef %package;
undef @excluded;
@@ -481,7 +487,7 @@ sub build_installer_media {
my $silent = $::verbose < 3 ? ' -s' : '';
print "-- messages from gendistrib -----------------------\n" if !$silent;
system("gendistrib $silent $arch_dir\n") == 0
- or die "ERROR: gendistrib failed to generate the media info.\n";
+ or die "ERROR: gendistrib failed to generate the media info\n";
print "---------------------------------------------------\n" if !$silent;
}