Abort package removal if the prerm script of a package returns non zero.

[oweals/opkg-lede.git] / libopkg / opkg_remove.c

diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c
index 0e967a39970eec65524ff5cd10855c9cdfb24320..c6f2e37141c3bb7339311344eb9e52adfd988372 100644 (file)
--- a/libopkg/opkg_remove.c
+++ b/libopkg/opkg_remove.c
@@ -170,6 +170,7 @@ static int
 remove_autoinstalled(pkg_t *pkg)
 {
        int i, j;
+       int err = 0;
        int n_deps;
        pkg_t *p;
        struct compound_depend *cdep;
@@ -182,7 +183,9 @@ remove_autoinstalled(pkg_t *pkg)
 
        for (i=0; i<count; i++) {
                cdep = &pkg->depends[i];
-               if (cdep->type != DEPEND)
+               if (cdep->type != PREDEPEND
+                   && cdep->type != DEPEND
+                   && cdep->type != RECOMMEND)
                        continue;
                for (j=0; j<cdep->possibility_count; j++) {
                        p = pkg_hash_fetch_installed_by_name(
@@ -203,7 +206,9 @@ remove_autoinstalled(pkg_t *pkg)
                                 opkg_msg(NOTICE, "%s was autoinstalled and is "
                                               "now orphaned, removing.\n",
                                               p->name);
-                                opkg_remove_pkg(p, 0);
+                               if (opkg_remove_pkg(p, 0) != 0) {
+                                       err = -1;
+                               }
                        } else
                                opkg_msg(INFO, "%s was autoinstalled and is "
                                                "still required by %d "
@@ -215,7 +220,7 @@ remove_autoinstalled(pkg_t *pkg)
                }
        }
 
-       return 0;
+       return err;
 }
 
 int
@@ -289,7 +294,16 @@ opkg_remove_pkg(pkg_t *pkg, int from_upgrade)
      pkg->state_want = SW_DEINSTALL;
      opkg_state_changed++;
 
-     pkg_run_script(pkg, "prerm", "remove");
+     if (pkg_run_script(pkg, "prerm", "remove") != 0) {
+         if (!conf->force_remove) {
+             opkg_msg(ERROR, "not removing package \"%s\", "
+                             "prerm script failed\n", pkg->name);
+             opkg_msg(NOTICE, "You can force removal of packages with failed "
+                              "prerm scripts with the option: \n"
+                              "\t--force-remove\n");
+             return -1;
+         }
+     }
 
      /* DPKG_INCOMPATIBILITY: dpkg is slightly different here. It
        maintains an empty filelist rather than deleting it. That seems
@@ -298,7 +312,7 @@ opkg_remove_pkg(pkg_t *pkg, int from_upgrade)
        feel free to fix this. */
      remove_data_files_and_list(pkg);
 
-     pkg_run_script(pkg, "postrm", "remove");
+     err = pkg_run_script(pkg, "postrm", "remove");
 
      remove_maintainer_scripts(pkg);
      pkg->state_status = SS_NOT_INSTALLED;
@@ -307,10 +321,12 @@ opkg_remove_pkg(pkg_t *pkg, int from_upgrade)
          parent_pkg->state_status = SS_NOT_INSTALLED;
 
      /* remove autoinstalled packages that are orphaned by the removal of this one */
-     if (conf->autoremove)
-       remove_autoinstalled(pkg);
-
-     return 0;
+     if (conf->autoremove) {
+         if (remove_autoinstalled(pkg) != 0) {
+             err = -1;
+         }
+     }
+     return err;
 }
 
 void
@@ -361,7 +377,7 @@ remove_data_files_and_list(pkg_t *pkg)
          }
 
          if (!conf->noaction) {
-               opkg_msg(INFO, "Deleting %s.\n", file_name, conf->noaction);
+               opkg_msg(INFO, "Deleting %s.\n", file_name);
               unlink(file_name);
          } else
                opkg_msg(INFO, "Not deleting %s. (noaction)\n",