From a888f377a5c805f1da24b556e6a4a9e3678d8eb3 Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Sun, 24 Aug 2008 23:24:53 +0200 Subject: 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 Signed-off-by: Nagy Gabor Signed-off-by: Dan McGee --- lib/libalpm/error.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'lib/libalpm/error.c') diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index df93cb7d..1f605806 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -140,9 +140,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("user aborted the operation"); case PM_ERR_INTERNAL_ERROR: return _("internal error"); - case PM_ERR_PKG_HOLD: - /* TODO wow this is not descriptive at all... what does this mean? */ - return _("not confirmed"); case PM_ERR_INVALID_REGEX: return _("invalid regular expression"); /* Errors from external libraries- our own wrapper error */ -- cgit v1.2.3-24-g4f1b