#include "opkg_download.h"
#include "opkg_remove.h"
#include "opkg_upgrade.h"
+#include "opkg_error.h"
#include "sprintf_alloc.h"
#include "file_util.h"
return OPKG_PACKAGE_ALREADY_INSTALLED;
}
- new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, package_name);
+ new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, package_name, NULL);
if (!new)
{
/* XXX: Error: Could not find package to install */
opkg_package_free (pdata.package);
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;
+ case OPKG_INSTALL_ERR_NOT_TRUSTED: return OPKG_GPG_ERROR;
+ case OPKG_INSTALL_ERR_DOWNLOAD: return OPKG_DOWNLOAD_FAILED;
+ case OPKG_INSTALL_ERR_DEPENDENCIES:
+ case OPKG_INSTALL_ERR_CONFLICTS: return OPKG_DEPENDENCIES_FAILED;
+ case OPKG_INSTALL_ERR_ALREADY_INSTALLED: return OPKG_PACKAGE_ALREADY_INSTALLED;
+ case OPKG_INSTALL_ERR_SIGNATURE: return OPKG_GPG_ERROR;
+ case OPKG_INSTALL_ERR_MD5: return OPKG_MD5_ERROR;
default: 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;
+ case OPKG_INSTALL_ERR_NOT_TRUSTED: return OPKG_GPG_ERROR;
+ case OPKG_INSTALL_ERR_DOWNLOAD: return OPKG_DOWNLOAD_FAILED;
+ case OPKG_INSTALL_ERR_DEPENDENCIES:
+ case OPKG_INSTALL_ERR_CONFLICTS: return OPKG_DEPENDENCIES_FAILED;
+ case OPKG_INSTALL_ERR_ALREADY_INSTALLED: return OPKG_PACKAGE_ALREADY_INSTALLED;
+ case OPKG_INSTALL_ERR_SIGNATURE: return OPKG_GPG_ERROR;
+ case OPKG_INSTALL_ERR_MD5: return OPKG_MD5_ERROR;
default: return OPKG_UNKNOWN_ERROR;
}
}
for (iter = opkg->conf->pkg_src_list.head; iter; iter = iter->next)
{
- char *url, *list_file_name = NULL, *sig_file_name = NULL;
+ char *url, *list_file_name = NULL;
src = iter->data;
free (url);
#ifdef HAVE_GPGME
+ char *sig_file_name;
/* download detached signitures to verify the package lists */
/* get the url for the sig file */
if (src->extra_data) /* debian style? */
if (old->state_status != SS_INSTALLED)
continue;
- new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, old->name);
+ new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, old->name, NULL);
if (new == NULL) {
/* XXX: Notice: Assuming locally install package is up to date */
continue;