|
Lines 6551-6557
Link Here
|
| 6551 |
# We need mydest defined up here to calc. protection paths. This is now done once per |
6551 |
# We need mydest defined up here to calc. protection paths. This is now done once per |
| 6552 |
# directory rather than once per file merge. This should really help merge performance. |
6552 |
# directory rather than once per file merge. This should really help merge performance. |
| 6553 |
# Trailing / ensures that protects/masks with trailing /'s match. |
6553 |
# Trailing / ensures that protects/masks with trailing /'s match. |
| 6554 |
mytruncpath="/"+offset+"/" |
6554 |
mytruncpath=self.myroot+offset+"/" |
| 6555 |
myppath=self.isprotected(mytruncpath) |
6555 |
myppath=self.isprotected(mytruncpath) |
| 6556 |
else: |
6556 |
else: |
| 6557 |
mergelist=stufftomerge |
6557 |
mergelist=stufftomerge |
|
Lines 6621-6629
Link Here
|
| 6621 |
if self.isprotected(mydest): |
6621 |
if self.isprotected(mydest): |
| 6622 |
# Use md5 of the target in ${D} if it exists... |
6622 |
# Use md5 of the target in ${D} if it exists... |
| 6623 |
if os.path.exists(os.path.normpath(srcroot+myabsto)): |
6623 |
if os.path.exists(os.path.normpath(srcroot+myabsto)): |
| 6624 |
mydest = new_protect_filename(myrealdest, newmd5=portage_checksum.perform_md5(srcroot+myabsto)) |
6624 |
mydest = new_protect_filename(mydest, newmd5=portage_checksum.perform_md5(srcroot+myabsto)) |
| 6625 |
else: |
6625 |
else: |
| 6626 |
mydest = new_protect_filename(myrealdest, newmd5=portage_checksum.perform_md5(myabsto)) |
6626 |
mydest = new_protect_filename(mydest, newmd5=portage_checksum.perform_md5(myabsto)) |
| 6627 |
|
6627 |
|
| 6628 |
# if secondhand==None it means we're operating in "force" mode and should not create a second hand. |
6628 |
# if secondhand==None it means we're operating in "force" mode and should not create a second hand. |
| 6629 |
if (secondhand!=None) and (not os.path.exists(myrealto)): |
6629 |
if (secondhand!=None) and (not os.path.exists(myrealto)): |
|
Lines 6755-6761
Link Here
|
| 6755 |
del cfgfiledict[myrealdest][0] |
6755 |
del cfgfiledict[myrealdest][0] |
| 6756 |
|
6756 |
|
| 6757 |
if cfgprot: |
6757 |
if cfgprot: |
| 6758 |
mydest = new_protect_filename(myrealdest, newmd5=mymd5) |
6758 |
mydest = new_protect_filename(mydest, newmd5=mymd5) |
| 6759 |
|
6759 |
|
| 6760 |
# whether config protection or not, we merge the new file the |
6760 |
# whether config protection or not, we merge the new file the |
| 6761 |
# same way. Unless moveme=0 (blocking directory) |
6761 |
# same way. Unless moveme=0 (blocking directory) |
|
Lines 6768-6774
Link Here
|
| 6768 |
mymtime=thismtime |
6768 |
mymtime=thismtime |
| 6769 |
# We need to touch the destination so that on --update the |
6769 |
# We need to touch the destination so that on --update the |
| 6770 |
# old package won't yank the file with it. (non-cfgprot related) |
6770 |
# old package won't yank the file with it. (non-cfgprot related) |
| 6771 |
os.utime(myrealdest,(thismtime,thismtime)) |
6771 |
os.utime(mydest,(thismtime,thismtime)) |
| 6772 |
zing="---" |
6772 |
zing="---" |
| 6773 |
if self.settings["USERLAND"] == "Darwin" and myrealdest[-2:] == ".a": |
6773 |
if self.settings["USERLAND"] == "Darwin" and myrealdest[-2:] == ".a": |
| 6774 |
|
6774 |
|
