From d456159a2b1b5bcd52a1b5046b4184f2f913dadb Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Sat, 22 Mar 2014 08:20:38 +0000 Subject: [PATCH] fixed: dist commands not using loadConfig --- ext/toolchain/commands1.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index 50f97b3c..cfafdcfa 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -1089,11 +1089,7 @@ class InternalCommands: raise Exception('Package failed: ' + str(err)) def distMac(self): - - config = self.getConfig() - if config.has_option("cmake", "mac_sdk"): - self.macSdk = config.get("cmake", "mac_sdk") - + self.loadConfig() dir = self.getGenerator().binDir name = "Synergy" dist = dir + "/" + name @@ -1204,16 +1200,13 @@ class InternalCommands: return major + '.' + minor + '.' + rev def distftp(self, type, ftp): - config = self.getConfig() - if config.has_option("cmake", "mac_sdk"): - self.macSdk = config.get("cmake", "mac_sdk") - if not type: raise Exception('Type not specified.') if not ftp: raise Exception('FTP info not defined.') + self.loadConfig() src = self.dist_name(type) dest = self.dist_name_rev(type) print 'Uploading %s to FTP server %s...' % (dest, ftp.host)