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 /src/pacman/pacman.c | |
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 'src/pacman/pacman.c')
-rw-r--r-- | src/pacman/pacman.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 3255cdf0..59916d62 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -540,6 +540,11 @@ static int parseargs(int argc, char *argv[]) } /* helper for being used with setrepeatingoption */ +static void option_add_holdpkg(const char *name) { + config->holdpkg = alpm_list_add(config->holdpkg, strdup(name)); +} + +/* helper for being used with setrepeatingoption */ static void option_add_syncfirst(const char *name) { config->syncfirst = alpm_list_add(config->syncfirst, strdup(name)); } @@ -702,7 +707,7 @@ static int _parseconfig(const char *file, const char *givensection, } else if(strcmp(key, "IgnoreGroup") == 0) { setrepeatingoption(ptr, "IgnoreGroup", alpm_option_add_ignoregrp); } else if(strcmp(key, "HoldPkg") == 0) { - setrepeatingoption(ptr, "HoldPkg", alpm_option_add_holdpkg); + setrepeatingoption(ptr, "HoldPkg", option_add_holdpkg); } else if(strcmp(key, "SyncFirst") == 0) { setrepeatingoption(ptr, "SyncFirst", option_add_syncfirst); } else if(strcmp(key, "DBPath") == 0) { |