Chantry Xavier a71f4c4c6a conflict.c : fix for FS#8156, detect conflict between symlink and dir. ... The previous fileconflict check (package vs filesystem) skipped the conflict when the file on the filesystem was a directory or a symlink to a directory, no matter what the file in the package was. Now, the conflict will only be skipped if the file in the package is a directory (so compatible with a dir or a dir symlink on the filesystem). So in the case of 8156 (new fileconflict003 pactest for this case), instead of silently ignoring the extraction of the test symlink, pacman will now fail because of a file conflict between the test symlink in the pkg2 package and the test directory on the filesystem. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>		2008-01-06 10:59:41 +01:00
..
add001.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
add002.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
add003.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
add004.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
add010.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
add011.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
add012.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
add013.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
add020.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
add021.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
add040.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
add041.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
add042.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
add043.py	new add043.py pactest	2007-11-14 18:49:02 -06:00
add044.py	Versioned provisions.	2007-11-18 20:05:51 -06:00
add045.py	Versioned provisions.	2007-11-18 20:05:51 -06:00
add046.py	PM_DEP_MOD_LT and PM_DEP_MOD_GT depmods added	2007-12-19 14:48:05 -06:00
add047.py	PM_DEP_MOD_LT and PM_DEP_MOD_GT depmods added	2007-12-19 14:48:05 -06:00
add050.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
add060.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
depconflict100.py	simple pactest renaming : split conflict* into depconflict* and fileconflict*.	2007-10-29 07:15:41 -05:00
depconflict110.py	simple pactest renaming : split conflict* into depconflict* and fileconflict*.	2007-10-29 07:15:41 -05:00
depconflict111.py	simple pactest renaming : split conflict* into depconflict* and fileconflict*.	2007-10-29 07:15:41 -05:00
depconflict120.py	simple pactest renaming : split conflict* into depconflict* and fileconflict*.	2007-10-29 07:15:41 -05:00
deptest001.py	Add more pactests to increase code coverage	2007-12-02 17:56:48 -06:00
dummy001.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
fileconflict001.py	simple pactest renaming : split conflict* into depconflict* and fileconflict*.	2007-10-29 07:15:41 -05:00
fileconflict002.py	simple pactest renaming : split conflict* into depconflict* and fileconflict*.	2007-10-29 07:15:41 -05:00
fileconflict003.py	conflict.c : fix for FS#8156, detect conflict between symlink and dir.	2008-01-06 10:59:41 +01:00
ldconfig001.py	ldconfig changes from CVS	2007-04-16 20:34:57 -05:00
ldconfig002.py	ldconfig changes from CVS	2007-04-16 20:34:57 -05:00
ldconfig003.py	ldconfig changes from CVS	2007-04-16 20:34:57 -05:00
mode001.py	Add mode and type checking to pactest for files	2007-07-01 20:03:15 -04:00
pacman001.py	Add 4 new pactests to get better code coverage by pactest	2007-12-02 17:24:22 -06:00
pacman002.py	Add 4 new pactests to get better code coverage by pactest	2007-12-02 17:24:22 -06:00
pacman003.py	Add 4 new pactests to get better code coverage by pactest	2007-12-02 17:24:22 -06:00
pacman004.py	Add 4 new pactests to get better code coverage by pactest	2007-12-02 17:24:22 -06:00
query001.py	Add more pactests to increase code coverage	2007-12-02 17:56:48 -06:00
query002.py	fix two broken pactests because of date localization.	2007-12-28 19:56:29 -06:00
query003.py	Add more pactests to increase code coverage	2007-12-02 17:56:48 -06:00
query004.py	Add more pactests to increase code coverage	2007-12-02 17:56:48 -06:00
query005.py	fix two broken pactests because of date localization.	2007-12-28 19:56:29 -06:00
remove001.py	pactest: remove001.py	2007-04-04 19:24:02 -05:00
remove010.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
remove011.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
remove020.py	* Oops. Messed a few things up, fixing them now.	2007-02-23 07:04:12 +00:00
remove021.py	* Oops. Messed a few things up, fixing them now.	2007-02-23 07:04:12 +00:00
remove030.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
remove040.py	pactest: fix description of remove040	2007-06-10 21:33:24 -04:00
remove041.py	Add five new pactest tests where pacman currently fails	2007-06-04 17:00:30 -04:00
remove042.py	Add new pactest remove042	2007-06-10 17:41:35 -04:00
remove043.py	Add new pactest remove043.	2007-06-11 11:21:19 +02:00
remove044.py	add remove044 pactest.	2007-07-10 11:10:54 -04:00
remove045.py	add remove045 pactest.	2007-07-10 11:10:54 -04:00
remove046.py	Add remove046 pactest for FS#7622.	2007-07-16 09:20:17 -04:00
remove047.py	Add a few pactests collected over time.	2007-09-06 19:30:18 -05:00
remove048.py	Add two pactests with broken requiredby, and two about pacsave handling.	2007-09-23 19:50:03 -05:00
requiredby001.py	Add three new 'requiredby' pactests	2007-05-14 10:56:52 -04:00
requiredby002.py	Add three new 'requiredby' pactests	2007-05-14 10:56:52 -04:00
requiredby003.py	Add three new 'requiredby' pactests	2007-05-14 10:56:52 -04:00
requiredby004.py	Add pactest requiredby004.	2007-06-12 16:19:50 -04:00
requiredby005.py	Add two requiredby pactests	2007-11-11 10:52:51 -06:00
requiredby006.py	Add two requiredby pactests	2007-11-11 10:52:51 -06:00
scriptlet001.py	Add real scriptlet checking for pactest	2007-12-10 23:06:48 -06:00
scriptlet002.py	Add real scriptlet checking for pactest	2007-12-10 23:06:48 -06:00
smoke001.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
symlink001.py	Add a symlink-based pactest	2007-11-11 09:51:09 -06:00
sync001.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync002.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync003.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync009.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync010.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync011.py	libalpm/deps.c : cleanup + little fix for resolvedeps.	2007-07-15 10:37:38 -04:00
sync012.py	Add new sync012 pactest.	2007-07-15 19:46:18 -04:00
sync020.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync021.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync030.py	Add --asdeps option to pacman	2007-07-15 12:46:02 -04:00
sync040.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync041.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync042.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync043.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync044.py	Add sync044 pactest : A dependency induces a replacement.	2007-09-23 19:50:11 -05:00
sync050.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync060.py	Add two pactests with broken requiredby, and two about pacsave handling.	2007-09-23 19:50:03 -05:00
sync100.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
sync101.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
sync102.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
sync103.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync110.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
sync120.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
sync130.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
sync131.py	* Writing 'replaces' info to both /desc and /depends files for testing - see the	2007-02-26 08:33:48 +00:00
sync132.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
sync133.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
sync134.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
sync135.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
sync136.py	New pactest: Sysupgrade with a sync package forcing a downgrade	2007-04-01 21:52:28 -04:00
sync137.py	Add a pactest for IgnorePkg and force on same package	2007-04-23 02:44:24 -04:00
sync138.py	Add pactest for IgnoreGroup.	2007-11-13 00:13:04 -06:00
sync200.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync300.py	Add five new pactest tests where pacman currently fails	2007-06-04 17:00:30 -04:00
sync301.py	Add sync301 pactest- pacman gains new deps and should be pulled in	2007-06-26 12:00:22 -04:00
sync400.py	Add a few pactests collected over time.	2007-09-06 19:30:18 -05:00
sync401.py	Add a few pactests collected over time.	2007-09-06 19:30:18 -05:00
sync402.py	Add a few pactests collected over time.	2007-09-06 19:30:18 -05:00
sync403.py	Add a few pactests collected over time.	2007-09-06 19:30:18 -05:00
sync404.py	sync.c: add sanity check so we don't dereference a null pointer	2008-01-05 17:35:43 -06:00
sync500.py	Versioned provisions.	2007-11-18 20:05:51 -06:00
sync890.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync891.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync892.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync893.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync895.py	* Silly mistake on making sync895 and sync896- I didn't create the field	2007-03-01 03:27:53 +00:00
sync896.py	* Silly mistake on making sync895 and sync896- I didn't create the field	2007-03-01 03:27:53 +00:00
sync897.py	* Some new tests. That bring new failures. :)	2007-02-27 20:49:23 +00:00
sync898.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync899.py	* Indentation changes - 4 spaces for python, we standardized this before (and	2007-02-21 06:33:13 +00:00
sync900.py	Add two new pactests for FS #6057	2007-06-10 20:14:20 -04:00
sync901.py	Add two new pactests for FS #6057	2007-06-10 20:14:20 -04:00
sync990.py	Fix for sync1003 and sync1004 pactests	2007-11-25 15:29:37 -06:00
sync992.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
sync999.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
sync1000.py	James Rosten <seinfeld90@gmail.com>	2007-03-19 04:23:45 +00:00
sync1001.py	* Updated Italian translation	2007-03-21 22:15:50 +00:00
sync1002.py	Add sync1002 pactest.	2007-07-20 10:33:42 -04:00
sync1003.py	Add sync1003 pactest.	2007-08-20 15:24:28 -04:00
sync1004.py	Add new (failing) sync pactest	2007-10-08 20:46:55 -05:00
sync1005.py	New sync1005 and sync1006 pactests	2007-12-01 11:29:41 -06:00
sync1006.py	New sync1005 and sync1006 pactests	2007-12-01 11:29:41 -06:00
sync1100.py	fix two broken pactests because of date localization.	2007-12-28 19:56:29 -06:00
sync1101.py	Add more pactests to increase code coverage	2007-12-02 17:56:48 -06:00
sync1102.py	Add more pactests to increase code coverage	2007-12-02 17:56:48 -06:00
sync1103.py	Add more pactests to increase code coverage	2007-12-02 17:56:48 -06:00
TESTS	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
trans001.py	new trans001.py pactest	2007-11-14 18:49:02 -06:00
type001.py	extend type001 pactest with a symlink.	2007-10-28 21:18:55 -05:00
upgrade001.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
upgrade002.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
upgrade003.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
upgrade004.py	Added pactest to repository, from Aurelien Foret:	2006-10-15 19:04:27 +00:00
upgrade010.py	libalpm/add.c: fix backup array issue	2007-09-23 20:48:04 -05:00
upgrade020.py	libalpm/add.c: fix backup array issue	2007-09-23 20:48:04 -05:00
upgrade021.py	libalpm/add.c: fix backup array issue	2007-09-23 20:48:04 -05:00
upgrade022.py	libalpm/add.c: fix backup array issue	2007-09-23 20:48:04 -05:00
upgrade023.py	libalpm/add.c: fix backup array issue	2007-09-23 20:48:04 -05:00
upgrade024.py	Add two pactests with broken requiredby, and two about pacsave handling.	2007-09-23 19:50:03 -05:00
upgrade025.py	libalpm/add.c: fix backup array issue	2007-09-23 20:48:04 -05:00
upgrade026.py	add.c : fix upgrade026 pactest.	2008-01-05 13:47:49 -06:00
upgrade030.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
upgrade031.py	Add --asdeps option to pacman	2007-07-15 12:46:02 -04:00
upgrade040.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
upgrade041.py	* Changes to quite a few of the tests, mostly minimal changes (better	2007-02-23 06:50:42 +00:00
upgrade042.py	new upgade042 pactest + bugfix in chk_filedifference.	2008-01-01 20:03:18 -06:00
upgrade043.py	conflict.c : fix for upgrade042.	2008-01-05 16:49:09 -06:00
upgrade050.py	* Added 5 new upgrade tests, which check various things with depends,	2007-02-27 01:34:07 +00:00
upgrade051.py	* Added 5 new upgrade tests, which check various things with depends,	2007-02-27 01:34:07 +00:00
upgrade052.py	* Added another test as suggested by Nagy on the ML- a package both provides	2007-02-28 04:00:21 +00:00
upgrade053.py	* Added another test as suggested by Nagy on the ML- a package both provides	2007-02-28 04:00:21 +00:00
upgrade054.py	* Added another test as suggested by Nagy on the ML- a package both provides	2007-02-28 04:00:21 +00:00
upgrade055.py	* Added another test as suggested by Nagy on the ML- a package both provides	2007-02-28 04:00:21 +00:00
upgrade056.py	libalpm/add.c,trans.c : cleanup of requiredby handling.	2007-08-20 15:23:53 -04:00
upgrade057.py	* Added another test as suggested by Nagy on the ML- a package both provides	2007-02-28 04:00:21 +00:00
upgrade058.py	James Rosten <seinfeld90@gmail.com>	2007-03-19 04:23:45 +00:00
upgrade059.py	Add five new pactest tests where pacman currently fails	2007-06-04 17:00:30 -04:00
upgrade060.py	Add five new pactest tests where pacman currently fails	2007-06-04 17:00:30 -04:00
upgrade061.py	Add five new pactest tests where pacman currently fails	2007-06-04 17:00:30 -04:00
xfercommand001.py	Added this test to check the XferCommand functionality	2007-03-05 18:06:45 +00:00