From 391952600d30bf7c28c5403c5c9e220d345ffe87 Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Fri, 2 Jan 2009 17:43:05 +0100 Subject: Fix for trans001.py (FS#9088) From now on _alpm_db_find_fileconflicts() works with upgrade and remove target lists (like checkdeps), which makes it transaction independent (we still need a trans param because of the progressbar). This is a small step towards the universal transaction. So we call this function directly from sync.c before commiting the remove transaction. This is much safer, but we can get false fileconflict error alarms in some tricky cases ("symlinks puzzle" etc). The patch on find_fileconflict looks complex, but it is mainly an "indent-patch", the new code-part can be found after the /* check remove list ... */ comment, and I modified something around the "file has changed hand" case (see comment modifications in the code). Unfortunately sync.c became more ugly, because we have to create 2 parallel internal transactions: to avoid duplicated work, upgrade transaction is used to load package data (filelists). This problem will disappear, when we finally get rid of internal transactions. Signed-off-by: Nagy Gabor Signed-off-by: Dan McGee --- pactest/tests/trans001.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'pactest') diff --git a/pactest/tests/trans001.py b/pactest/tests/trans001.py index b3d7883b..b9889b14 100644 --- a/pactest/tests/trans001.py +++ b/pactest/tests/trans001.py @@ -18,5 +18,3 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") self.addrule("PKG_EXIST=pkg3") - -self.expectfailure = True -- cgit v1.2.3-70-g09d2