From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 10 May 2016 13:58:40 +0000 (+0200)
Subject: Canonicalize home_dir, download key-build.pub as well
X-Git-Tag: v1~277
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e4cfd053e453434fe67e6e8d72e619ee0e3e0b6a;p=buildbot.git

Canonicalize home_dir, download key-build.pub as well

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 165c554..4a99013 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -47,7 +47,7 @@ c['mergeRequests'] = True
 
 ####### CHANGESOURCES
 
-home_dir = ini.get("general", "homedir")
+home_dir = os.path.abspath(ini.get("general", "homedir"))
 
 repo_url = ini.get("repo", "url")
 
@@ -308,7 +308,8 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
 	))
 
 	# install build key
-	factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0600))
+	factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0400))
+	factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="key-build.pub", mode=0400))
 
 	# prepare dl
 	factory.addStep(ShellCommand(
diff --git a/phase2/master.cfg b/phase2/master.cfg
index 246ef92..0ad5f36 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -47,7 +47,7 @@ c['mergeRequests'] = True
 
 ####### CHANGESOURCES
 
-home_dir = ini.get("general", "homedir")
+home_dir = os.path.abspath(ini.get("general", "homedir"))
 
 repo_url = ini.get("repo", "url")
 
@@ -165,6 +165,7 @@ for arch in arches:
 		haltOnFailure = True))
 
 	factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="sdk/key-build", mode=0400))
+	factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="sdk/key-build.pub", mode=0400))
 
 	factory.addStep(ShellCommand(
 		name = "mkdldir",