diff options
| author |   Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2008-07-04 19:30:02 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2008-07-04 19:30:02 +0530 |
| commit | 6fd86b761e2180b2d5c3662011c402890eff89bd (patch) | |
| tree | e82df85781cf792cc81fa6fe291002179dd46cad | |
| parent | Move jobuild.sh 'ping-pong' code to autotua.daemon (diff) | |
| download | autotua-6fd86b761e2180b2d5c3662011c402890eff89bd.tar.gz autotua-6fd86b761e2180b2d5c3662011c402890eff89bd.tar.bz2 autotua-6fd86b761e2180b2d5c3662011c402890eff89bd.zip | |
WorkChroot rsync is now 'rsync-nc' (no-clobber)
| -rw-r--r-- | slave/autotua/chroot/__init__.py | 2 | ||||
| -rw-r--r-- | slave/autotua/sync/__init__.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/slave/autotua/chroot/__init__.py b/slave/autotua/chroot/__init__.py index 915d803..07f41b2 100644 --- a/slave/autotua/chroot/__init__.py +++ b/slave/autotua/chroot/__init__.py @@ -123,7 +123,7 @@ class WorkChroot(object): return False self._clean_mounts() # self.chroot.dir/ => rsync *contents* to self.dir - syncer = sync.Syncer(uri=self.pristine.dir+"/", destdir=self.dir, scheme='rsync') + syncer = sync.Syncer(uri=self.pristine.dir+"/", destdir=self.dir, scheme='rsync-nc') syncer.sync() self._setup_mounts() print "Work Chroot ready." diff --git a/slave/autotua/sync/__init__.py b/slave/autotua/sync/__init__.py index a72125d..7f9a954 100644 --- a/slave/autotua/sync/__init__.py +++ b/slave/autotua/sync/__init__.py @@ -110,11 +110,11 @@ class Command(object): elif self.scheme == 'git-export': return 'git-archive --prefix="%s/" --remote="%s" "%s" | tar x -C "%s"' % (osp.basename(self.destdir), self.uri, self.rev, osp.dirname(self.destdir)) elif self.scheme == 'rsync': - command = 'rsync -a --delete "%s" "%s"' % (self.uri, self.destdir) - if const.VERBOSE: - command += ' --verbose' - return command - raise "Unknown scheme: %s" % self.scheme + return 'rsync -a --delete-after "%s" "%s"' % (self.uri, self.destdir) + elif self.scheme == 'rsync-nc': + return 'rsync -a "%s" "%s"' % (self.uri, self.destdir) + else: + raise "Unknown scheme: %s" % self.scheme def run(self, action): """Run a sync command""" |