a->nodeps = c->nodeps;
a->noaction = c->noaction;
a->query_all = c->query_all;
- a->multiple_providers = c->multiple_providers;
a->verbosity = c->verbosity;
if (c->offline_root)
{
/* XXX: Error: Could not satisfy dependencies */
pkg_vec_free (deps);
- return OPKG_DEPENDANCIES_FAILED;
+ return OPKG_DEPENDENCIES_FAILED;
}
/* insert the package we are installing so that we download it */
(curl_progress_func) curl_progress_cb, &cb_data);
free(url);
+ if (err)
+ {
+ pkg_vec_free (deps);
+ opkg_package_free (pdata.package);
+ return OPKG_DOWNLOAD_FAILED;
+ }
+
}
pkg_vec_free (deps);
err = opkg_install_pkg(opkg->conf, new, 0);
if (err)
- return err;
+ {
+ 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;
+ default: return OPKG_UNKNOWN_ERROR;
+ }
+ }
progress (pdata, 75);
/* run configure scripts, etc. */
err = opkg_configure_packages (opkg->conf, NULL);
if (err)
- return err;
+ {
+ opkg_package_free (pdata.package);
+ return OPKG_UNKNOWN_ERROR;
+ }
/* write out status files and file lists */
opkg_conf_write_status_files (opkg->conf);
int
opkg_remove_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
{
+ int err;
pkg_t *pkg = NULL;
pkg_t *pkg_to_remove;
opkg_progress_data_t pdata;
opkg_assert (opkg != NULL);
opkg_assert (package_name != NULL);
-
-
pkg_info_preinstall_check (opkg->conf);
-
pkg = pkg_hash_fetch_installed_by_name (&opkg->conf->pkg_hash, package_name);
if (pkg == NULL)
progress (pdata, 75);
- opkg_remove_pkg (opkg->conf, pkg_to_remove, 0);
+ err = opkg_remove_pkg (opkg->conf, pkg_to_remove, 0);
/* write out status files and file lists */
opkg_conf_write_status_files (opkg->conf);
progress (pdata, 100);
opkg_package_free (pdata.package);
- return 0;
+ return (err) ? OPKG_UNKNOWN_ERROR : OPKG_NO_ERROR;
}
int
opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
{
+ int err;
pkg_t *pkg;
opkg_progress_data_t pdata;
pdata.package = old_pkg_to_new (pkg);
progress (pdata, 0);
- opkg_upgrade_pkg (opkg->conf, pkg);
+ err = opkg_upgrade_pkg (opkg->conf, pkg);
+ if (err)
+ return OPKG_UNKNOWN_ERROR;
progress (pdata, 75);
- opkg_configure_packages (opkg->conf, NULL);
+ err = opkg_configure_packages (opkg->conf, NULL);
+ if (err)
+ return OPKG_UNKNOWN_ERROR;
progress (pdata, 100);
opkg_package_free (pdata.package);
return 0;
pkg_src_t *src;
int sources_list_count, sources_done;
opkg_progress_data_t pdata;
- char *tmp_file_name = NULL;
opkg_assert (opkg != NULL);
return 1;
}
- /* cout the number of sources so we can give some progress updates */
+ /* count the number of sources so we can give some progress updates */
sources_list_count = 0;
sources_done = 0;
iter = opkg->conf->pkg_src_list.head;
for (iter = opkg->conf->pkg_src_list.head; iter; iter = iter->next)
{
- char *url, *list_file_name;
+ char *url, *list_file_name = NULL, *sig_file_name = NULL;
src = iter->data;
{
FILE *in, *out;
struct _curl_cb_data cb_data;
+ char *tmp_file_name = NULL;
sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
fclose (out);
unlink (tmp_file_name);
}
+ free (tmp_file_name);
}
else
err = opkg_download (opkg->conf, url, list_file_name, NULL, NULL);
- free (tmp_file_name);
if (err)
{
else
sprintf_alloc (&url, "%s/%s", src->value, "Packages.sig");
- /* create temporary file for it */
- sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig");
+ /* create filename for signature */
+ sprintf_alloc (&sig_file_name, "%s/%s.sig", lists_dir, src->name);
- err = opkg_download (opkg->conf, url, tmp_file_name, NULL, NULL);
+ /* make sure there is no existing signature file */
+ unlink (sig_file_name);
+
+ err = opkg_download (opkg->conf, url, sig_file_name, NULL, NULL);
if (err)
{
/* XXX: Warning: Download failed */
else
{
int err;
- err = opkg_verify_file (opkg->conf, list_file_name, tmp_file_name);
+ err = opkg_verify_file (opkg->conf, list_file_name, sig_file_name);
if (err == 0)
{
/* XXX: Notice: Signature check passed */
/* XXX: Warning: Signature check failed */
}
}
- unlink (tmp_file_name);
- free (tmp_file_name);
+ free (sig_file_name);
+ free (list_file_name);
free (url);
#else
/* XXX: Note: Signiture check for %s skipped because GPG support was not
* enabled in this build
*/
#endif
- free (list_file_name);
sources_done++;
progress (pdata, 100 * sources_done / sources_list_count);