diff options
| author | Allan McRae <allan@archlinux.org> | 2013-02-12 13:00:53 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-02-24 04:11:54 +0100 |
| commit | 34749e177db5d4aafdb9f3de630c7ab193a0f36d (patch) | |
| tree | 93d21fc0a0c170589acf19617e15cd9d9d8949d1 /test | |
| parent | 19754b34a36203266c4e02f29178084c77282efd (diff) | |
| download | pacman-34749e177db5d4aafdb9f3de630c7ab193a0f36d.tar.gz pacman-34749e177db5d4aafdb9f3de630c7ab193a0f36d.tar.xz | |
Perform limited conflict checking with --force
Pacman currently bails when trying to extract a file over a directory
when using --force. Instead of ignoring all conflict, perform the
check and skip any file-file conflicts. Conflicts between directories
and files are still flagged and cause the transation to abort.
As a bonus, we now know about files changing packages when using
--force, so we can skip removing them fixing upgrade046.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/pacman/tests/upgrade046.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/pacman/tests/upgrade046.py b/test/pacman/tests/upgrade046.py index a02a7132..d9ac66b9 100644 --- a/test/pacman/tests/upgrade046.py +++ b/test/pacman/tests/upgrade046.py @@ -29,5 +29,3 @@ self.addrule("FILE_MODIFIED=bin/dummy") self.addrule("FILE_MODIFIED=bin/foobar") self.addrule("FILE_EXIST=usr/share/file") self.addrule("FILE_MODIFIED=usr/share/file") - -self.expectfailure = True |