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-13 05:44:00 +0100 |
| commit | a888f377a5c805f1da24b556e6a4a9e3678d8eb3 (patch) | |
| tree | 70ffd810a0b240429d2dfaa0d7266e228b6212f2 /lib/libalpm/alpm.h | |
| parent | 8017b0bb8ec5364f8a3999caffc6b3c3ea991810 (diff) | |
| download | pacman-a888f377a5c805f1da24b556e6a4a9e3678d8eb3.tar.gz pacman-a888f377a5c805f1da24b556e6a4a9e3678d8eb3.tar.xz | |
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 'lib/libalpm/alpm.h')
| -rw-r--r-- | lib/libalpm/alpm.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index eda35d30..ecce02f9 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -132,11 +132,6 @@ void alpm_option_add_ignorepkg(const char *pkg); void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs); int alpm_option_remove_ignorepkg(const char *pkg); -alpm_list_t *alpm_option_get_holdpkgs(); -void alpm_option_add_holdpkg(const char *pkg); -void alpm_option_set_holdpkgs(alpm_list_t *holdpkgs); -int alpm_option_remove_holdpkg(const char *pkg); - alpm_list_t *alpm_option_get_ignoregrps(); void alpm_option_add_ignoregrp(const char *grp); void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); @@ -376,9 +371,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_REPLACE_PKG = 0x02, PM_TRANS_CONV_CONFLICT_PKG = 0x04, PM_TRANS_CONV_CORRUPTED_PKG = 0x08, - PM_TRANS_CONV_LOCAL_NEWER = 0x10, - /* 0x20 flag can go here */ - PM_TRANS_CONV_REMOVE_HOLDPKG = 0x40 + PM_TRANS_CONV_LOCAL_NEWER = 0x10 } pmtransconv_t; /* Transaction Progress */ @@ -522,7 +515,6 @@ enum _pmerrno_t { PM_ERR_INTERNAL_ERROR, PM_ERR_DB_SYNC, PM_ERR_RETRIEVE, - PM_ERR_PKG_HOLD, PM_ERR_INVALID_REGEX, /* External library errors */ PM_ERR_LIBARCHIVE, |