opkg: update error handling for opkg_update_pkg in opkg.c and bump version number

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

diff --git a/libopkg/opkg.c b/libopkg/opkg.c
index 6cd0423fcfd1d400873471507fa723ad2fdd0dbe..3d5447f0022b29808783224b7eb6f6390ba1c562 100644 (file)
--- a/libopkg/opkg.c
+++ b/libopkg/opkg.c
@@ -620,8 +620,21 @@ opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_call
   progress (pdata, 0);
 
   err = opkg_upgrade_pkg (opkg->conf, pkg);
   progress (pdata, 0);
 
   err = opkg_upgrade_pkg (opkg->conf, pkg);

+  /* opkg_upgrade_pkg returns the error codes of opkg_install_pkg */

   if (err)
   if (err)

-    return OPKG_UNKNOWN_ERROR;
+  {
+    switch (err)
+    {
+      case PKG_INSTALL_ERR_NOT_TRUSTED: return OPKG_GPG_ERROR;
+      case PKG_INSTALL_ERR_DOWNLOAD: return OPKG_DOWNLOAD_FAILED;
+      case PKG_INSTALL_ERR_DEPENDENCIES:
+      case PKG_INSTALL_ERR_CONFLICTS: return OPKG_DEPENDENCIES_FAILED;
+      case PKG_INSTALL_ERR_ALREADY_INSTALLED: return OPKG_PACKAGE_ALREADY_INSTALLED;
+      case PKG_INSTALL_ERR_SIGNATURE: return OPKG_GPG_ERROR;
+      case PKG_INSTALL_ERR_MD5: return OPKG_MD5_ERROR;
+      default: return OPKG_UNKNOWN_ERROR;
+    }
+  }

   progress (pdata, 75);
 
   err = opkg_configure_packages (opkg->conf, NULL);
   progress (pdata, 75);
 
   err = opkg_configure_packages (opkg->conf, NULL);