Skip to content

Add symlink support to bsync #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IslandC0der wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add symlink support to bsync #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions bsync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def rsync_init(sshSrc,dirnameSrc, sshDst,dirnameDst):
rsyncsrc = getdirstr(sshSrc, dirnameSrc)+"/"
rsyncdst = getdirstr(sshDst, dirnameDst)+"/"

args = [ "-a", "--files-from=-", "--from0", "--no-implied-dirs", "--out-format=rsync: %n%L" ]
args = [ "-rLptgoD", "--files-from=-", "--from0", "--no-implied-dirs", "--out-format=rsync: %n%L" ]
if ssh != None:
cmdlist = ssh.getcmdlist()
cmdlist.remove(ssh.userhost)
Expand Down Expand Up @@ -210,7 +210,7 @@ def rsync_check(sshSrc,dirnameSrc, sshDst,dirnameDst):
rsyncsrc = getdirstr(sshSrc, dirnameSrc)+"/"
rsyncdst = getdirstr(sshDst, dirnameDst)+"/"

args = [ "-anO", "--delete", "--out-format=%n%L", "--exclude=/.bsync-snap-*" ]
args = [ "-rLptgoDnO", "--delete", "--out-format=%n%L", "--exclude=/.bsync-snap-*" ]
if ssh != None:
args.append("-e "+ssh.getcmdstr())

Expand All @@ -227,7 +227,7 @@ def rsync_check(sshSrc,dirnameSrc, sshDst,dirnameDst):
def make_snapshot(ssh,dirname, oldsnapname, newsnapname):
global findformat, findcmdlocal, findcmdremote

cmd = " %s -fprintf %s '%s'" % (quote(dirname), quote(dirname+"/"+newsnapname), findformat)
cmd = " -L %s -fprintf %s '%s'" % (quote(dirname), quote(dirname+"/"+newsnapname), findformat)
if oldsnapname!=None:
cmd+= " && rm -f "+quote(dirname+"/"+oldsnapname)
# remove inconsistent newsnap if error in find
Expand All @@ -251,9 +251,9 @@ def make_snapshots(ssh1,dir1name, ssh2,dir2name, oldsnapname):
def get_find_proc(ssh, dirname):
global findformat, findcmdlocal, findcmdremote
if ssh==None:
return subprocess.Popen([ findcmdlocal, dirname, "-printf", findformat ], stdout=subprocess.PIPE)
return subprocess.Popen([ findcmdlocal, "-L", dirname, "-printf", findformat ], stdout=subprocess.PIPE)
else:
return subprocess.Popen(ssh.getcmdlist()+[findcmdremote+" "+quote(dirname)+" -printf '"+findformat+"'" ], stdout=subprocess.PIPE)
return subprocess.Popen(ssh.getcmdlist()+[findcmdremote+" -L "+quote(dirname)+" -printf '"+findformat+"'" ], stdout=subprocess.PIPE)

# get a file descriptor to read the snapshot file
def get_snap_fd(ssh, dirname, snapname):
Expand Down