Nagy Gabor 72bc947cbb Fix "-Sd conflict_pkg" bug ...

If the -d switch was invoked with -S (or -U), the removes list was simply
lost, because trans->remove was computed in an
"if(!(trans->flags & PM_TRANS_FLAG_NODEPS))" block.

I've added a new pactest file, sync045.py (derived from sync043.py) to test
this.

Additionally, I did some other minor cleanups in sync_prepare:
 * preferred list is not needed anymore
 * I removed a needless alpm_list_remove_dupes line (the target list should
   not contain dupes at all)
 * I moved alpm_list_free(remove); to cleanup part to eliminate a possible
   memleak

Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan@archlinux.org>

2009-10-11 15:30:52 -05:00

..

.gitignore

Add an initial pactest/test/.gitignore

2009-05-18 22:25:53 -05:00

depconflict100.py

simple pactest renaming : split conflict* into depconflict* and fileconflict*.

2007-10-29 07:15:41 -05:00

depconflict110.py

Use sync.c for upgrade transaction prepare and commit

2009-09-08 22:04:14 -05:00

depconflict111.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06:00

depconflict120.py

simple pactest renaming : split conflict* into depconflict* and fileconflict*.

2007-10-29 07:15:41 -05:00

deptest001.py

Move the deptest code from frontend to backend.

2008-01-21 19:35:43 -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

pactest: add test.expectfailure option for tests

2008-07-24 22:16:29 -05:00

fileconflict002.py

pactest: add test.expectfailure option for tests

2008-07-24 22:16:29 -05:00

fileconflict003.py

conflict.c : fix for FS#8156, detect conflict between symlink and dir.

2008-01-06 10:59:41 +01:00

fileconflict004.py

Fix fileconflict004

2009-07-20 10:13:25 -05:00

fileconflict005.py

Fix fileconflict004

2009-07-20 10:13:25 -05:00

fileconflict006.py

Fix fileconflict004

2009-07-20 10:13:25 -05:00

fileconflict007.py

Fix klibc conflict case.

2009-07-20 10:13:42 -05:00

ignore001.py

Don't prompt the user for unignore of IgnorePkg/IgnoreGroup packages

2009-02-23 20:37:14 -06:00

ignore002.py

Change Y/n to y/N with REMOVE_PKGS (remove_unresolvable) callback

2009-09-08 21:54:51 -05:00

ignore003.py

Change Y/n to y/N with REMOVE_PKGS (remove_unresolvable) callback

2009-09-08 21:54:51 -05:00

ignore004.py

Change Y/n to y/N with REMOVE_PKGS (remove_unresolvable) callback

2009-09-08 21:54:51 -05:00

ignore005.py

Re-enable REMOVE_PKGS test in pactest suite

2009-09-08 22:18:13 -05:00

ldconfig001.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06: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

Makefile.am

Quiet up the make process a bit

2008-10-12 21:36:30 -05:00

mode001.py

Update pactest to allow setting modes on created files

2008-04-28 22:24:40 -05:00

mode002.py

Update pactest to allow setting modes on created files

2008-04-28 22:24:40 -05:00

mode003.py

Rework extract_single_file() temp file creation

2008-04-28 22:24:40 -05: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

provision001.py

Change the versioned provision format.

2008-01-14 22:03:03 -06:00

provision010.py

Rename provision related pactests to provision*.py.

2008-01-14 21:43:30 -06:00

provision011.py

Change the versioned provision format.

2008-01-14 22:03:03 -06:00

provision012.py

Change the versioned provision format.

2008-01-14 22:03:03 -06:00

provision020.py

Change Y/n to y/N with REMOVE_PKGS (remove_unresolvable) callback

2009-09-08 21:54:51 -05:00

provision021.py

Change the versioned provision format.

2008-01-14 22:03:03 -06:00

provision022.py

Change Y/n to y/N with REMOVE_PKGS (remove_unresolvable) callback

2009-09-08 21:54:51 -05: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

Update -Ss and -Qs pactests to include groups

2008-03-30 16:47:27 -05: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

reason001.py

New reason001.py pactest

2008-01-11 23:19:08 -06:00

remove001.py

Remove trans->targets

2008-03-10 18:57:36 -05:00

remove010.py

Do not create .pacsave with -R, if the file is unchanged

2009-07-20 16:37:37 -05: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

HoldPkg rework

2009-01-12 22:44:00 -06:00

remove040.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

remove041.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

remove042.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

remove043.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

remove044.py

add remove044 pactest.

2007-07-10 11:10:54 -04:00

remove045.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

remove047.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

remove049.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

remove050.py

Add -Rss option

2008-03-10 19:16:01 -05:00

remove051.py

Add -Rss option

2008-03-10 19:16:01 -05:00

remove052.py

Pactest for removing multiple items in a dependency chain.

2008-05-29 06:37:19 -05:00

remove060.py

New remove060.py pactest

2008-07-13 09:14:36 -05:00

scriptlet001.py

Rework fakechroot checking

2008-10-12 21:29:04 -05:00

scriptlet002.py

Rework fakechroot checking

2008-10-12 21:29:04 -05:00

smoke001.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06: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

Remove requiredby from pactests

2008-07-07 21:14:13 -05: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

Drop case insensitive comparisons in the config parsing.

2008-03-17 20:58:28 -05:00

sync030.py

Add --asdeps option to pacman

2007-07-15 12:46:02 -04:00

sync031.py

New --asexplicit option

2008-01-21 19:39:26 -06: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

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync043.py

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync044.py

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync045.py

Fix "-Sd conflict_pkg" bug

2009-10-11 15:30:52 -05:00

sync050.py

* Changes to quite a few of the tests, mostly minimal changes (better

2007-02-23 06:50:42 +00: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

sync104.py

Introduce -Suu

2009-07-22 20:16:52 -05:00

sync110.py

Added pactest to repository, from Aurelien Foret:

2006-10-15 19:04:27 +00:00

sync120.py

Drop case insensitive comparisons in the config parsing.

2008-03-17 20:58:28 -05: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

Remove find_replacements()

2009-05-18 23:11:05 -05:00

sync133.py

Drop case insensitive comparisons in the config parsing.

2008-03-17 20:58:28 -05: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

Drop case insensitive comparisons in the config parsing.

2008-03-17 20:58:28 -05:00

sync150.py

Allow '-Su foo' operation

2009-09-08 21:45:17 -05:00

sync200.py.in

update sync200 pactest

2009-10-11 15:12:44 -05:00

sync300.py

Change Y/n to y/N with REMOVE_PKGS (remove_unresolvable) callback

2009-09-08 21:54:51 -05:00

sync301.py

Add SyncFirst option.

2008-05-13 15:49:02 -05:00

sync400.py

Remove requiredby from pactests

2008-07-07 21:14:13 -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

pactest: add test.expectfailure option for tests

2008-07-24 22:16:29 -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

Pactests for sync operations with NoUpgrade and NoExtract

2008-05-29 06:37:20 -05:00

sync501.py

Pactests for sync operations with NoUpgrade and NoExtract

2008-05-29 06:37:20 -05:00

sync890.py

Do not remove conflict by default

2009-09-08 22:03:24 -05: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

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync893.py

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync895.py

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync896.py

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync897.py

Do not remove conflict by default

2009-09-08 22:03:24 -05: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

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync900.py

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync901.py

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync990.py

Fix for sync1003 and sync1004 pactests

2007-11-25 15:29:37 -06:00

sync992.py

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync993.py

Look in target-list first to resolve dependencies

2009-04-11 14:39:24 -05:00

sync999.py

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync1000.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

sync1003.py

Resolvedeps rework

2008-07-07 21:12:55 -05:00

sync1004.py

Do not remove conflict by default

2009-09-08 22:03:24 -05:00

sync1008.py

Change Y/n to y/N with REMOVE_PKGS (remove_unresolvable) callback

2009-09-08 21:54:51 -05:00

sync1100.py

fix two broken pactests because of date localization.

2007-12-28 19:56:29 -06:00

sync1101.py

Update -Ss and -Qs pactests to include groups

2008-03-30 16:47:27 -05: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

trans001.py

Fix for trans001.py (FS#9088)

2009-04-11 13:59:55 -05: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

upgrade005.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06:00

upgrade010.py

Drop case insensitive comparisons in the config parsing.

2008-03-17 20:58:28 -05:00

upgrade011.py

ensure chk_fileconflicts reads entire file list

2008-02-11 20:40:43 -06:00

upgrade012.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06:00

upgrade013.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06:00

upgrade014.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06:00

upgrade015.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06:00

upgrade016.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06: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

upgrade032.py

New --asexplicit option

2008-01-21 19:39:26 -06:00

upgrade040.py

Fixes file relocation pactests

2008-02-11 20:40:43 -06:00

upgrade041.py

Fixes file relocation pactests

2008-02-11 20:40:43 -06: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

upgrade045.py

pactest: make more resiliant to missing files

2008-02-07 19:36:17 -06:00

upgrade046.py

pactest: add test.expectfailure option for tests

2008-07-24 22:16:29 -05:00

upgrade050.py

* Added 5 new upgrade tests, which check various things with depends,

2007-02-27 01:34:07 +00:00

upgrade051.py

Use sync.c for upgrade transaction prepare and commit

2009-09-08 22:04:14 -05:00

upgrade052.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade053.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade054.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade055.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade056.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade057.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade058.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade059.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade060.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade061.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade070.py

Drop case insensitive comparisons in the config parsing.

2008-03-17 20:58:28 -05:00

upgrade071.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06:00

upgrade072.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06:00

upgrade073.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade074.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06:00

upgrade075.py

Move -A pactests that are relevant to -U, clean the rest out

2008-03-08 14:13:22 -06:00

upgrade076.py

Remove requiredby from pactests

2008-07-07 21:14:13 -05:00

upgrade080.py

Check package arch before installing

2009-09-06 15:51:25 -05:00

upgrade081.py

Check package arch before installing

2009-09-06 15:51:25 -05:00

upgrade082.py

Check package arch before installing

2009-09-06 15:51:25 -05:00

upgrade083.py

Check package arch before installing

2009-09-06 15:51:25 -05:00

upgrade084.py

Add pactest for 'any' architecture

2009-09-06 16:04:05 -05:00

upgrade090.py

Use sync.c for upgrade transaction prepare and commit

2009-09-08 22:04:14 -05:00

xfercommand001.py

Drop case insensitive comparisons in the config parsing.

2008-03-17 20:58:28 -05:00