From: Daniel Robbins Date: Thu, 6 Nov 2003 03:00:26 +0000 (+0000) Subject: target finder path fix X-Git-Tag: CATALYST_1_0_1~180 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2268281e5557dbae5cffa5637efec1fb78721980;p=catalyst.git target finder path fix git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@60 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/modules/targets.py b/modules/targets.py index fbbd3f06..2133e2e6 100644 --- a/modules/targets.py +++ b/modules/targets.py @@ -187,11 +187,11 @@ class generic_stage_target(generic_target): for x in cleanables: print "Cleaning chroot: "+x+"..." cmd("rm -rf "+destpath+x,"Couldn't clean "+x) - cmd(self.settings["storedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh clean","clean script failed.") + cmd(self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh clean","clean script failed.") def preclean(self): try: - cmd(self.settings["storedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh preclean","preclean script failed.") + cmd(self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh preclean","preclean script failed.") except: self.unbind() raise @@ -227,7 +227,7 @@ class generic_stage_target(generic_target): elif type(self.settings[x])==types.ListType: os.environ["clst_"+x]=string.join(self.settings[x]) try: - cmd(self.settings["storedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh run","build script failed") + cmd(self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh run","build script failed") finally: #pre-clean is for stuff that needs to run with bind-mounts still active self.preclean()