xbps-bin: added -f flag for remove target.
Now if any package is going to be removed and it's required by other packages, it won't let you remove it unless -f is set. Here's an example of how it looks like: [juan@fedora-vm xbps]$ xbps-bin -r ~/testing-xbps remove glibc WARNING! glibc is required by the following packages: zlib-1.2.3 ncurses-libs-5.7 gcc-libstdc++-4.3.2 e2fsprogs-libs-1.41.4 cracklib-2.8.13 expat-2.0.1 ncurses-5.7 cpio-2.9 module-init-tools-3.6 busybox-initramfs-1.13.2 udev-138 procps-3.2.7 pam-1.0.2 dbus-libs-1.2.12 lzma-utils-libs-4.32.7 coreutils-7.1 sed-4.1.5 grep-2.5.4 gawk-3.1.6 gzip-1.3.12 bzip2-1.0.5 bash-4.0 less-424 gdbm-1.8.3 groff-1.20.1 lzma-utils-4.32.7 dbus-1.2.12 proplib-0.3 dash-0.5.4 findutils-4.4.0 util-linux-ng-2.14.2 initramfs-tools-0.92o file-5.00 diffutils-2.8.1 wget-1.11.4 man-db-2.5.3 sysklogd-1.5 eject-2.1.5 shadow-4.1.2.2 sudo-1.7.0 e2fsprogs-1.41.4 tzdata-2009a vim-7.2 upstart-0.5.1 kernel-2.6.28.1 xbps-base-pkg-0.1 kbd-1.14.1 If you are sure about this, use -f to force deletion for this package. [juan@fedora-vm xbps]$ --HG-- extra : convert_revision : eeb92925e51f11d5b3bf7e069ed4986ae5fb0c2d
This commit is contained in:
parent
b4806141f7
commit
f1f34487e2
2 changed files with 57 additions and 6 deletions
|
@ -38,6 +38,7 @@
|
||||||
static void usage(void);
|
static void usage(void);
|
||||||
static void show_missing_deps(prop_dictionary_t, const char *);
|
static void show_missing_deps(prop_dictionary_t, const char *);
|
||||||
static int show_missing_dep_cb(prop_object_t, void *, bool *);
|
static int show_missing_dep_cb(prop_object_t, void *, bool *);
|
||||||
|
static int show_reqby_pkgs(prop_object_t, void *, bool *);
|
||||||
static int list_pkgs_in_dict(prop_object_t, void *, bool *);
|
static int list_pkgs_in_dict(prop_object_t, void *, bool *);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -54,15 +55,18 @@ usage(void)
|
||||||
" Options shared by all targets:\n"
|
" Options shared by all targets:\n"
|
||||||
" -r\t\t<rootdir>\n"
|
" -r\t\t<rootdir>\n"
|
||||||
" -v\t\t<verbose>\n"
|
" -v\t\t<verbose>\n"
|
||||||
" Option used by the files target:\n"
|
" Options used by the files target:\n"
|
||||||
" -C\t\tTo check the SHA256 hash for any listed file.\n"
|
" -C\t\tTo check the SHA256 hash for any listed file.\n"
|
||||||
|
" Options used by the remove target:\n"
|
||||||
|
" -f\t\tForce removal, even if package is required by other\n"
|
||||||
|
" \t\tpackages that are currently installed.\n"
|
||||||
"\n"
|
"\n"
|
||||||
" Examples:\n"
|
" Examples:\n"
|
||||||
" $ xbps-bin install klibc\n"
|
" $ xbps-bin install klibc\n"
|
||||||
" $ xbps-bin -r /path/to/root install klibc\n"
|
" $ xbps-bin -r /path/to/root install klibc\n"
|
||||||
" $ xbps-bin -C files klibc\n"
|
" $ xbps-bin -C files klibc\n"
|
||||||
" $ xbps-bin list\n"
|
" $ xbps-bin list\n"
|
||||||
" $ xbps-bin remove klibc\n"
|
" $ xbps-bin -f remove klibc\n"
|
||||||
" $ xbps-bin show klibc\n");
|
" $ xbps-bin show klibc\n");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
@ -114,19 +118,43 @@ show_missing_dep_cb(prop_object_t obj, void *arg, bool *loop_done)
|
||||||
return EINVAL;
|
return EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
show_reqby_pkgs(prop_object_t obj, void *arg, bool *loop_done)
|
||||||
|
{
|
||||||
|
static size_t count;
|
||||||
|
(void)arg;
|
||||||
|
(void)loop_done;
|
||||||
|
|
||||||
|
if (count == 0)
|
||||||
|
printf("\n\t");
|
||||||
|
else if (count == 4) {
|
||||||
|
printf("\n\t");
|
||||||
|
count = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("%s ", prop_string_cstring_nocopy(obj));
|
||||||
|
count++;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char **argv)
|
main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
prop_dictionary_t dict;
|
prop_dictionary_t dict;
|
||||||
|
prop_array_t reqby;
|
||||||
char *plist, *root = NULL;
|
char *plist, *root = NULL;
|
||||||
int c, flags = 0, rv = 0;
|
int c, flags = 0, rv = 0;
|
||||||
bool chkhash = false;
|
bool chkhash = false, forcerm = false;
|
||||||
|
|
||||||
while ((c = getopt(argc, argv, "Cr:v")) != -1) {
|
while ((c = getopt(argc, argv, "Cfr:v")) != -1) {
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case 'C':
|
case 'C':
|
||||||
chkhash = true;
|
chkhash = true;
|
||||||
break;
|
break;
|
||||||
|
case 'f':
|
||||||
|
forcerm = true;
|
||||||
|
break;
|
||||||
case 'r':
|
case 'r':
|
||||||
/* To specify the root directory */
|
/* To specify the root directory */
|
||||||
root = optarg;
|
root = optarg;
|
||||||
|
@ -198,6 +226,31 @@ main(int argc, char **argv)
|
||||||
if (argc != 2)
|
if (argc != 2)
|
||||||
usage();
|
usage();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* First check if package is required by other packages.
|
||||||
|
*/
|
||||||
|
dict = xbps_find_pkg_installed_from_plist(argv[1]);
|
||||||
|
if (dict == NULL) {
|
||||||
|
printf("Package %s is not installed.\n", argv[1]);
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
|
reqby = prop_dictionary_get(dict, "requiredby");
|
||||||
|
if (reqby != NULL && prop_array_count(reqby) > 0) {
|
||||||
|
printf("WARNING! %s is required by the following "
|
||||||
|
"packages:\n", argv[1]);
|
||||||
|
(void)xbps_callback_array_iter_in_dict(dict,
|
||||||
|
"requiredby", show_reqby_pkgs, NULL);
|
||||||
|
prop_object_release(dict);
|
||||||
|
if (!forcerm) {
|
||||||
|
printf("\n\nIf you are sure about this, use "
|
||||||
|
"-f to force deletion for this package.\n");
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
} else
|
||||||
|
printf("\n\nForcing %s for deletion!\n",
|
||||||
|
argv[1]);
|
||||||
|
}
|
||||||
|
|
||||||
rv = xbps_remove_binary_pkg(argv[1], root, flags);
|
rv = xbps_remove_binary_pkg(argv[1], root, flags);
|
||||||
if (rv != 0) {
|
if (rv != 0) {
|
||||||
if (errno == ENOENT)
|
if (errno == ENOENT)
|
||||||
|
|
2
doc/TODO
2
doc/TODO
|
@ -27,8 +27,6 @@ xbps-bin:
|
||||||
* Add support to update packages.
|
* Add support to update packages.
|
||||||
* While installing a package, check if version that is going to be
|
* While installing a package, check if version that is going to be
|
||||||
installed is already installed.
|
installed is already installed.
|
||||||
* While removing a package, abort if pkg is required by others
|
|
||||||
(looking at its requiredby array object).
|
|
||||||
|
|
||||||
xbps-repo:
|
xbps-repo:
|
||||||
* Replace binpkg-genindex.sh with a target for xbps-repo to generate the
|
* Replace binpkg-genindex.sh with a target for xbps-repo to generate the
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue