Change: upload workspace

1 files changed, 9 insertions, 10 deletions

diff --git a/contractor b/contractor
index 666736f..03ed7ea 100755
--- a/contractor
+++ b/contractor
@@ -31,7 +31,7 @@ def ssh(target, argv, quiet=False):
 
 
 def rsync(filename, target):
-    argv = ['rsync', '-aHSs', '--', filename, target]
+    argv = ['rsync', '-aHSs', '--delete', '--', filename, target]
     logging.info('RSYNC: {!r}'.format(argv))
     return subprocess.call(argv, stderr=STDOUT, stdout=None)
 
@@ -90,15 +90,10 @@ class ContractorApplication(cliapp.Application):
         else:
             self.verbose('no packages to install')
 
-        # if pkgs:
-        #     self.cmd_setup(
-        #         ['env', 'DEBIAN_INTERFACE=noninteractive',
-        #          'apt-get', 'install', '-y'] + pkgs)
-
-        # workspace = os.path.expanduser(build['workspace'])
-        # if workspace and os.path.isdir(workspace):
-        #     self.verbose('Uploading saved workspace from {}'.format(workspace))
-        #     self.cmd_put_workspace([workspace])
+        ws = bs.workspace()
+        if ws and os.path.exists(ws):
+            self.verbose('upload saved workspace from {}'.format(ws))
+            w.upload_workspace(ws)
 
         # source = os.path.expanduser(build['source'])
         # self.verbose('Uploading source code from {}'.format(source))
@@ -496,5 +491,9 @@ class Worker:
              'apt-get', '-y', 'install'] + pkgs)
         return exit_code
 
+    def upload_workspace(self, dirname):
+        return rsync(
+            '{}/.'.format(dirname), '{}/workspace/.'.format(self._target))
+
 
 ContractorApplication().run()