Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dimipaun/safekeep
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: frankcrawford/safekeep
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 31, 2020

  1. Merge pull request #3 from frankcrawford/rdiff-backup-2.0.5 

    Address issue with '::' as an argument to rdiff-backup.
    @frankcrawford
    frankcrawford authored Oct 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7bd3880 View commit details

  2. Merge pull request #4 from frankcrawford/rdiff-backup-1 

    Allow local and remote executable to be specified
    @frankcrawford
    frankcrawford authored Oct 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2545915 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 safekeep
4 changes: 2 additions & 2 deletions safekeep
View file
Original file line number Diff line number Diff line change
@@ -1564,8 +1564,8 @@ def do_server_rdiff(cfg, bdir, nice, ionice, force):

userhost = ''
if cfg['host']:
userhost = '%s@%s' % (cfg['user'], cfg['host'])
args.extend([userhost + '::' + bdir, cfg['dir']])
userhost = '%s@%s::' % (cfg['user'], cfg['host'])
args.extend([userhost + bdir, cfg['dir']])
ret = spawn(args)
if ret:
raise Exception('Failed to run %s' % executable_lookup(cfg, 'rdiff-backup', 'local'))