summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2011-05-27 21:53:23 +0000
committerOlivier Blin <blino@mageia.org>2011-05-27 21:53:23 +0000
commit29cb84b3461f09f4476c4422292e40b4ec5f05a0 (patch)
tree8b431c1546368370a8729db86ac0a65bcc6f2783
parentde552e4b99c5c66cce0afc586fb59d9a22376148 (diff)
downloaddrakiso-29cb84b3461f09f4476c4422292e40b4ec5f05a0.tar
drakiso-29cb84b3461f09f4476c4422292e40b4ec5f05a0.tar.gz
drakiso-29cb84b3461f09f4476c4422292e40b4ec5f05a0.tar.bz2
drakiso-29cb84b3461f09f4476c4422292e40b4ec5f05a0.tar.xz
drakiso-29cb84b3461f09f4476c4422292e40b4ec5f05a0.zip
add a -<set> suffix to chroot/build directories if live->{settings}{set} is defined
-rw-r--r--lib/MDV/Draklive/Live.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/MDV/Draklive/Live.pm b/lib/MDV/Draklive/Live.pm
index c8618ee..64c0cad 100644
--- a/lib/MDV/Draklive/Live.pm
+++ b/lib/MDV/Draklive/Live.pm
@@ -13,14 +13,19 @@ sub get_name {
join('-', grep { $_ } @{$live->{settings}}{@$fields});
}
+sub get_set_suffix {
+ my ($live) = @_;
+ $live->{settings}{set} ? "-$live->{settings}{set}" : "";
+}
+
sub get_builddir {
my ($live) = @_;
- $live->{settings}{builddir} . '/' . $live->get_name;
+ $live->{settings}{builddir} . '/' . $live->get_name . $live->get_set_suffix;
}
sub get_system_root {
my ($live) = @_;
- $live->{settings}{chroot} . '/' . $live->get_name;
+ $live->{settings}{chroot} . '/' . $live->get_name . $live->get_set_suffix;
}
sub get_media_prefix {