From 4af234c36ca59d7312e3a540f5bd01a3b5b718ef Mon Sep 17 00:00:00 2001 From: Priscila Manhaes <psilva@iff.edu.br> Date: Fri, 26 Aug 2011 16:39:48 -0300 Subject: [PATCH] Moved cloudooo_paster cause it referenced in installconversionserver --- slapos/recipe/cloudooo/__init__.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/slapos/recipe/cloudooo/__init__.py b/slapos/recipe/cloudooo/__init__.py index a89e0ca29..275b4423a 100755 --- a/slapos/recipe/cloudooo/__init__.py +++ b/slapos/recipe/cloudooo/__init__.py @@ -47,6 +47,15 @@ class Recipe(BaseSlapRecipe): key, certificate = self.requestCertificate('Cloudooo') + cloudooo_paster = os.path.join(self.bin_directory, 'cloudooo_paster') + ooo_paster = self.options['ooo_paster'] + if os.path.lexists(cloudooo_paster): + if not os.readlink(cloudooo_paster) != ooo_paster: + os.unlink(cloudooo_paster) + if not os.path.lexists(cloudooo_paster): + os.symlink(ooo_paster, cloudooo_paster) + self.options['cloudooo_paster'] = cloudooo_paster + conversion_server_conf = self.installConversionServer( self.getLocalIPv4Address(), 23000, 23060) @@ -66,15 +75,6 @@ class Recipe(BaseSlapRecipe): os.symlink(runUnitTest, runCloudoooUnitTest) self.path_list.append(runCloudoooUnitTest) - cloudooo_paster = os.path.join(self.bin_directory, 'cloudooo_paster') - ooo_paster = self.options['ooo_paster'] - if os.path.lexists(cloudooo_paster): - if not os.readlink(cloudooo_paster) != ooo_paster: - os.unlink(cloudooo_paster) - if not os.path.lexists(cloudooo_paster): - os.symlink(ooo_paster, cloudooo_paster) - self.path_list.append(cloudooo_paster) - self.linkBinary() self.setConnectionDict(dict( site_url="https://[%s]:%s/" % (stunnel_conf['public_ip'], -- 2.30.9