From 46c11708c09d6e5ff937f3fc194200d6726b3865 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Sat, 19 Mar 2016 12:41:54 -0400 Subject: [PATCH] The upload script now uses a per-distro tmp directory. No issue # --- jenkins/run_upload_packages.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py index 04e6c80..b44cbdc 100755 --- a/jenkins/run_upload_packages.py +++ b/jenkins/run_upload_packages.py @@ -137,7 +137,7 @@ class DistroPackageSuite(PackageSuite): def upload_files(self, paths): cmd = self._build_cmd('scp', *paths) - cmd.append('{self.ssh_host}:{self.REMOTE_DEST_DIR}'.format(self=self)) + cmd.append('{self.ssh_host}:{self.REMOTE_DEST_DIR}/{self.target}'.format(self=self)) subprocess.check_call(cmd) @@ -157,7 +157,7 @@ rm "$@" } def post_uploads(self, paths): - self._run_script(self.FREIGHT_SCRIPT, self.REMOTE_DEST_DIR, + self._run_script(self.FREIGHT_SCRIPT, self.REMOTE_DEST_DIR + '/' + self.target, self.TARGET_DISTNAMES[self.target], *self._paths_basenames(paths)) @@ -178,7 +178,7 @@ createrepo "$REPODIR" def post_uploads(self, paths): repo_dir = os.path.join(self.REPO_ROOT, self.TARGET_REPODIRS[self.target]) - self._run_script(self.CREATEREPO_SCRIPT, self.REMOTE_DEST_DIR, + self._run_script(self.CREATEREPO_SCRIPT, self.REMOTE_DEST_DIR + '/' + self.target, repo_dir, *self._paths_basenames(paths)) -- 2.39.5