From 561e863fc2744c6930227e35b9e63c4b567988a5 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 17 Feb 2006 18:59:26 +0000
Subject: don't use 'noregion' subdir if $live->{regions} doesn't exist

---
 tools/draklive | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/draklive b/tools/draklive
index 3086addeb..c629438de 100755
--- a/tools/draklive
+++ b/tools/draklive
@@ -247,16 +247,19 @@ sub run_ {
     run_program::raw($options, @_);
 }
 
+sub get_region_suffix {
+    my ($live) = @_;
+    defined $live->{system}{region} ? $live->{system}{region} . '/' : ref $live->{regions} ? 'noregion/' : '';
+}
+
 sub get_workdir {
     my ($live) = @_;
-    $live->{copy_wizard} ?
-      $live->{workdir} :
-      $live->{workdir} . '/' . ($live->{system}{region} || 'noregion');
+    $live->{workdir} . get_region_suffix($live);
 }
 
 sub get_system_root {
     my ($live) = @_;
-    $live->{system}{root} . '/' . ($live->{system}{region} || 'noregion');
+    $live->{workdir} . get_region_suffix($live);
 }
 
 sub get_initrd_path {
-- 
cgit v1.2.1