From ff837ae5f5344adbedb2c7d9b3ab70335b689305 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 3 Nov 2010 15:23:44 +0300 Subject: [PATCH] Fix finish assemble detect. Fix assemble linux path. --- pym/cl_fill_builder.py | 2 +- pym/cl_image_cmd.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pym/cl_fill_builder.py b/pym/cl_fill_builder.py index ab41218..a2050eb 100644 --- a/pym/cl_fill_builder.py +++ b/pym/cl_fill_builder.py @@ -362,7 +362,7 @@ class fillVars(object, varsShare): '/var/calculate/remote/linux', '/usr/calculate/share/linux'] if self.Get('os_builder_profile'): - imagePath.append(path.join("/var/calculate/remote/assemble", + imagePath.insert(0,path.join("/var/calculate/remote/assemble", self.Get('os_builder_profile').replace('/','-'), "linux")) return imagePath diff --git a/pym/cl_image_cmd.py b/pym/cl_image_cmd.py index 0640ec9..e1178f5 100644 --- a/pym/cl_image_cmd.py +++ b/pym/cl_image_cmd.py @@ -63,8 +63,7 @@ class image_cmd(share_cmd): def __sectionName(self): """Get section name of assemble.env by shortname and arch""" - return (self.logicObj.clVars.Get('os_builder_linux_shortname'), - self.logicObj.clVars.Get('os_builder_arch_machine')) + return self.logicObj.clVars.Get('os_builder_profile') def isScratch(self,showError=True): """Detect scartch system"""