From 935c4e429f370cd29709b365c5233ac0683a73b5 Mon Sep 17 00:00:00 2001 From: agaffney Date: Sun, 28 Sep 2008 21:52:32 -0500 Subject: [PATCH] Automatically prepend build dir path to livecd/iso if it's not an absolute path --- ChangeLog | 5 +++++ modules/generic_stage_target.py | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d655af69..4c61e701 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 29 Sep 2008; Andrew Gaffney + modules/generic_stage_target.py: + Automatically prepend build dir path to livecd/iso if it's not an absolute + path + 28 Sep 2008; Andrew Gaffney TODO: Update TODO with placeholder idea diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 5fba3b8c..9be4c419 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -333,8 +333,15 @@ class generic_stage_target(generic_target): def set_iso(self): if self.settings.has_key(self.settings["spec_prefix"]+"/iso"): - self.settings["iso"]=\ - normpath(self.settings[self.settings["spec_prefix"]+"/iso"]) + if self.settings[self.settings["spec_prefix"]+"iso"].startswith('/'): + self.settings["iso"]=\ + normpath(self.settings[self.settings["spec_prefix"]+"/iso"]) + else: + # This automatically prepends the build dir to the ISO output path + # if it doesn't start with a / + self.settings["iso"] = normpath(self.settings["storedir"] + \ + "/builds/" + self.settings["rel_type"] + "/" + \ + self.settings[self.settings["spec_prefix"]+"iso"]) del self.settings[self.settings["spec_prefix"]+"/iso"] def set_fstype(self): -- 2.26.2