|
Lines 5917-5922
Link Here
|
| 5917 |
if (ver.isowner(f, destroot) or ver.isprotected(f)): |
5917 |
if (ver.isowner(f, destroot) or ver.isprotected(f)): |
| 5918 |
isowned = True |
5918 |
isowned = True |
| 5919 |
break |
5919 |
break |
|
|
5920 |
# Look for same inodes as f in other versions => means no collision |
| 5921 |
if ver.getcontents()==None: |
| 5922 |
continue |
| 5923 |
for myf in ver.getcontents(): |
| 5924 |
if not os.path.exists(myf): |
| 5925 |
continue |
| 5926 |
if os.path.samefile(f, myf): |
| 5927 |
myrealpath = os.path.realpath(f) |
| 5928 |
if myrealpath==f: |
| 5929 |
myotherpath=myf |
| 5930 |
else: |
| 5931 |
myotherpath=f |
| 5932 |
print yellow("*")+" "+myotherpath+" points to "+myrealpath |
| 5933 |
isowned = True |
| 5934 |
break |
| 5920 |
if not isowned: |
5935 |
if not isowned: |
| 5921 |
print "existing file "+f+" is not owned by this package" |
5936 |
print "existing file "+f+" is not owned by this package" |
| 5922 |
stopmerge=True |
5937 |
stopmerge=True |
