diff options
| author | Xavier Chantry <chantry.xavier@gmail.com> | 2010-10-12 00:42:04 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-12-13 03:19:24 +0100 |
| commit | abefa23341caa995cc0d155d30baa7faeb7a6c0e (patch) | |
| tree | e723b522e8c34458019c2496a586e8f449760feb /src | |
| parent | 3a9dec104858a64489b004296d009c8222e7f040 (diff) | |
| download | pacman-abefa23341caa995cc0d155d30baa7faeb7a6c0e.tar.gz pacman-abefa23341caa995cc0d155d30baa7faeb7a6c0e.tar.xz | |
alpm/remove.c : respect --dbonly during remove-upgrade
When a -Sk or -Uk operation induced a removal of an existing local
package, --dbonly was not in effect and the files were all removed.
Fixing this behavior was already marked as TODO in database012 pactest
------------
TODO: I honestly think the above should NOT delete the original les, it
hould upgrade the DB entry without touching anything on the file stem.
E.g. this test should be the same as:
pacman -R --dbonly dummy && pacman -U --dbonly dummy.pkg.tar.gz
------------
Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
[Dan: small coding style touchup]
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/pacman.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index ae349a35..5ba798b4 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -132,7 +132,6 @@ static void usage(int op, const char * const myname) printf("%s: %s {-R --remove} [%s] <%s>\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); addlist(_(" -c, --cascade remove packages and all packages that depend on them\n")); - addlist(_(" -k, --dbonly only remove database entries, do not remove files\n")); addlist(_(" -n, --nosave remove configuration files as well\n")); addlist(_(" -s, --recursive remove dependencies also (that won't break packages)\n" " (-ss includes explicitly installed dependencies too)\n")); @@ -180,7 +179,6 @@ static void usage(int op, const char * const myname) case PM_OP_SYNC: case PM_OP_UPGRADE: addlist(_(" -f, --force force install, overwrite conflicting files\n")); - addlist(_(" -k, --dbonly add database entries, do not install or keep existing files\n")); addlist(_(" --asdeps install packages as non-explicitly installed\n")); addlist(_(" --asexplicit install packages as explicitly installed\n")); addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); @@ -189,6 +187,7 @@ static void usage(int op, const char * const myname) /* pass through */ case PM_OP_REMOVE: addlist(_(" -d, --nodeps skip dependency checks\n")); + addlist(_(" -k, --dbonly only modify database entries, not package files\n")); addlist(_(" --noprogressbar do not show a progress bar when downloading files\n")); addlist(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); addlist(_(" --print only print the targets instead of performing the operation\n")); |