Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
*~
*.pyc
*.swp
for_noarch
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -259,3 +259,7 @@ Ran 29 tests in 3.320s

OK
```

## msrsync3
carlilek: Added a python3 specific version called msrsync3. Not completely tested, use at your own risk. All command line options are the same as msrsync.
```
4 changes: 3 additions & 1 deletion msrsync
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ def run_rsync(files_from, rsync_opts, src, dest, timeout=3600*24*7):
# this looks very close to the _check_rsync_options function...
# except the error message
rsync_log = files_from + '.log'
rsync_cmd = "%s %s %s %s %s" % (RSYNC_EXE, rsync_opts, "--quiet --verbose --stats --from0 --files-from=%s --log-file %s" % (files_from, rsync_log), src, dest)
rsync_cmd = '%s %s %s "%s" "%s"' % (RSYNC_EXE, rsync_opts, "--quiet --verbose --stats --from0 --files-from=%s --log-file %s" % (files_from, rsync_log), src, dest)
#rsync_cmd = "%s %s %s %s %s" % (RSYNC_EXE, rsync_opts, "--quiet --from0 --files-from=%s" % (files_from,), src, dest)

rsync_result = dict()
Expand Down Expand Up @@ -821,6 +821,8 @@ def rsync_worker(jobs_queue, monitor_queue, options, dest):
for src, files_from, bucket_files_nr, bucket_size in consume_queue(jobs_queue):
if not options.dry_run:
rsync_result = run_rsync(files_from, options.rsync, src, dest)
else:
rsync_result = dict(rcode=0, elapsed=0, errcode=0, msg='')
rsync_mon_result = {"type": TYPE_RSYNC, "rsync_result": rsync_result, "size": bucket_size, "files_nr": bucket_files_nr, "jq_size": jobs_queue.qsize()}
monitor_queue.put(rsync_mon_result)
except (KeyboardInterrupt, SystemExit):
Expand Down
Loading