|
Lines 6442-6448
Link Here
|
| 6442 |
# We need mydest defined up here to calc. protection paths. This is now done once per |
6442 |
# We need mydest defined up here to calc. protection paths. This is now done once per |
| 6443 |
# directory rather than once per file merge. This should really help merge performance. |
6443 |
# directory rather than once per file merge. This should really help merge performance. |
| 6444 |
# Trailing / ensures that protects/masks with trailing /'s match. |
6444 |
# Trailing / ensures that protects/masks with trailing /'s match. |
| 6445 |
mytruncpath = os.path.join(destroot, offset) + os.path.sep |
6445 |
mytruncpath = os.path.sep + \ |
|
|
6446 |
os.path.join( |
| 6447 |
destroot.strip(os.path.sep), offset.strip(os.path.sep)) + \ |
| 6448 |
os.path.sep |
| 6446 |
myppath=self.isprotected(mytruncpath) |
6449 |
myppath=self.isprotected(mytruncpath) |
| 6447 |
else: |
6450 |
else: |
| 6448 |
mergelist=stufftomerge |
6451 |
mergelist=stufftomerge |
