Skip to content
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.

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

Update adb-sync from fork #47

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Prev Previous commit
when -L (copy-link) is specified, allow writing to true targets point…
…ed to by the link (local only)
lingnand committed Nov 25, 2019
commit 9d7227f5032fb18dcc3d6c8977f90d009fd71acb
6 changes: 6 additions & 0 deletions adb-sync
Original file line number Diff line number Diff line change
@@ -585,6 +585,9 @@ class FileSyncer(object):
src_stat = remotestat
dst_stat = localstat
dst_name = self.dst[i] + name
if r2l and self.copy_links:
# use true destination if we allow copy links (only for local)
dst_name = os.path.realpath(dst_name)
logging.info('%s-Delete-Conflicting: %r', self.push[i], dst_name.decode('utf-8'))
if stat.S_ISDIR(localstat.st_mode) or stat.S_ISDIR(remotestat.st_mode):
if not self.allow_replace:
@@ -628,6 +631,9 @@ class FileSyncer(object):
for name, s in self.src_only[i]:
src_name = self.src[i] + name
dst_name = self.dst[i] + name
if i == 1 and self.copy_links:
# use true destination if we allow copy links (only for local)
dst_name = os.path.realpath(dst_name)
logging.info('%s: %r', self.push[i], dst_name.decode('utf-8'))
if stat.S_ISDIR(s.st_mode):
if not self.dry_run: