[pacman-dev] [PATCH] Detect potental confict when symlink to directory is changing to directory

Allan McRae allan at archlinux.org
Sat Dec 5 07:27:40 UTC 2015


On 05/12/15 05:13, Andrew Gregory wrote:
> s/potental/potential/ s/confict/conflict/
> 
> On 12/04/15 at 07:41am, Allan McRae wrote:
>> When a symlink to a directory is changing to a directory and takes a file with
>> it, pacman does not result the path of the file on the filesystem when checking
> 
> The paths in question actually just need to be skipped altogether, not
> resolved.
> 
>> for conflicts.
>>
>> Reported by Neofytos and Luca from Chakra.
>>
>> Signed-off-by: Allan McRae <allan at archlinux.org>
>> ---
>>
>> This only works based on pacmans return failure. Why is the usr/include/bar being
>> detected as a directory and not a symlink?
>>
>>
>>  test/pacman/tests/TESTS         |  1 +
>>  test/pacman/tests/symlink021.py | 27 +++++++++++++++++++++++++++
>>  2 files changed, 28 insertions(+)
>>  create mode 100644 test/pacman/tests/symlink021.py
>>
>> diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS
>> index e330896..bee7c8e 100644
>> --- a/test/pacman/tests/TESTS
>> +++ b/test/pacman/tests/TESTS
>> @@ -150,6 +150,7 @@ TESTS += test/pacman/tests/symlink010.py
>>  TESTS += test/pacman/tests/symlink011.py
>>  TESTS += test/pacman/tests/symlink012.py
>>  TESTS += test/pacman/tests/symlink020.py
>> +TESTS += test/pacman/tests/symlink021.py
>>  TESTS += test/pacman/tests/sync-install-assumeinstalled.py
>>  TESTS += test/pacman/tests/sync-nodepversion01.py
>>  TESTS += test/pacman/tests/sync-nodepversion02.py
>> diff --git a/test/pacman/tests/symlink021.py b/test/pacman/tests/symlink021.py
> 
> Our more recent tests use more descriptive names.
> 

Thanks for the fixes.

This one is a partner to symlink020.py so I kept the name.

A


More information about the pacman-dev mailing list