diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2008-08-24 23:24:53 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-01-12 22:44:00 -0600 |
| commit | a888f377a5c805f1da24b556e6a4a9e3678d8eb3 (patch) | |
| tree | 70ffd810a0b240429d2dfaa0d7266e228b6212f2 /pactest | |
| parent | 8017b0bb8ec5364f8a3999caffc6b3c3ea991810 (diff) | |
HoldPkg rework
The HoldPkg feature is even more important when the packages to be held are
pulled automatically by pacman, in a -Rc and -Rs operation. Before, it only
applied when the packages were explicitly requested by the user to be
removed. This patch extends holdpkg to -Rc and -Rs by doing the HoldPkg
check just before trans_commit.
Additionally, the whole HoldPkg stuff was moved to the front-end.
I changed the default behavior to "don't remove", so I modified remove030.py
pactest as well.
See also: FS#9173.
Original-work-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'pactest')
| -rw-r--r-- | pactest/tests/remove030.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pactest/tests/remove030.py b/pactest/tests/remove030.py index 9e2b9da5..e975a4ba 100644 --- a/pactest/tests/remove030.py +++ b/pactest/tests/remove030.py @@ -7,7 +7,5 @@ self.option["HoldPkg"] = ["dummy"] self.args = "-R %s" % p1.name -self.addrule("PACMAN_RETCODE=0") -self.addrule("!PKG_EXIST=dummy") -self.addrule("!FILE_EXIST=etc/dummy.conf") -self.addrule("!FILE_PACSAVE=etc/dummy.conf") +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=dummy") |