new->name = sstrdup (old->name);
new->version = pkg_version_str_alloc (old);
new->architecture = sstrdup (old->architecture);
- new->repository = sstrdup (old->src->name);
+ if (old->src)
+ new->repository = sstrdup (old->src->name);
new->description = sstrdup (old->description);
new->tags = sstrdup (old->tags);
new->url = sstrdup (old->url);
free (p->description);
free (p->tags);
free (p->url);
+ free (p->repository);
free (p);
}
opkg_conf_deinit (opkg->conf);
args_deinit (opkg->args);
+ free (opkg->options);
+ free (opkg->args);
+ free (opkg->conf);
+ free (opkg);
}
int
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)
opkg_install_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
{
int err;
- char *package_id = NULL;
+ char *stripped_filename;
opkg_progress_data_t pdata;
- pkg_t *new;
+ pkg_t *old, *new;
+ pkg_vec_t *deps, *all;
+ int i, ndepends;
+ char **unresolved = NULL;
opkg_assert (opkg != NULL);
opkg_assert (package_name != NULL);
/* ... */
pkg_info_preinstall_check (opkg->conf);
- new = pkg_hash_fetch_best_installation_candidate_by_name (opkg->conf, package_name);
+ /* check to ensure package is not already installed */
+ old = pkg_hash_fetch_installed_by_name(&opkg->conf->pkg_hash, package_name);
+ if (old)
+ {
+ /* XXX: Error: Package is already installed. */
+ return OPKG_PACKAGE_ALREADY_INSTALLED;
+ }
+
+ new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, package_name);
if (!new)
{
/* XXX: Error: Could not find package to install */
- return 1;
+ return OPKG_PACKAGE_NOT_FOUND;
}
+
+ new->state_flag |= SF_USER;
+
pdata.action = OPKG_INSTALL;
pdata.package = old_pkg_to_new (new);
progress (pdata, 0);
- /* download the package */
- opkg_prepare_url_for_install (opkg->conf, package_name, &package_id);
-
- progress (pdata, 50);
+ /* find dependancies and download them */
+ deps = pkg_vec_alloc ();
+ /* this function does not return the original package, so we insert it later */
+ ndepends = pkg_hash_fetch_unsatisfied_dependencies (opkg->conf, new, deps, &unresolved);
+ if (unresolved)
+ {
+ /* XXX: Error: Could not satisfy dependencies */
+ pkg_vec_free (deps);
+ return OPKG_DEPENDENCIES_FAILED;
+ }
- if (!package_id)
- package_id = strdup (package_name);
+ /* insert the package we are installing so that we download it */
+ pkg_vec_insert (deps, new);
- /* unpack the package */
- if (opkg->conf->multiple_providers)
+ /* download package and dependancies */
+ for (i = 0; i < deps->len; i++)
{
- err = opkg_install_multi_by_name (opkg->conf, package_id);
+ pkg_t *pkg;
+ struct _curl_cb_data cb_data;
+ char *url;
+
+ pkg = deps->pkgs[i];
+ if (pkg->local_filename)
+ continue;
+
+ opkg_package_free (pdata.package);
+ pdata.package = old_pkg_to_new (pkg);
+ pdata.action = OPKG_DOWNLOAD;
+
+ if (pkg->src == NULL)
+ {
+ /* XXX: Error: Package not available from any configured src */
+ return OPKG_PACKAGE_NOT_AVAILABLE;
+ }
+
+ sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
+
+ /* Get the filename part, without any directory */
+ stripped_filename = strrchr(pkg->filename, '/');
+ if ( ! stripped_filename )
+ stripped_filename = pkg->filename;
+
+ sprintf_alloc(&pkg->local_filename, "%s/%s", opkg->conf->tmp_dir, stripped_filename);
+
+ cb_data.cb = progress_callback;
+ cb_data.progress_data = &pdata;
+ cb_data.opkg = opkg;
+ cb_data.user_data = user_data;
+ /* 75% of "install" progress is for downloading */
+ cb_data.start_range = 75 * i / deps->len;
+ cb_data.finish_range = 75 * (i + 1) / deps->len;
+
+ err = opkg_download(opkg->conf, url, pkg->local_filename,
+ (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;
+ }
+
}
- else
+ pkg_vec_free (deps);
+
+ /* clear depenacy checked marks, left by pkg_hash_fetch_unsatisfied_dependencies */
+ all = pkg_vec_alloc ();
+ pkg_hash_fetch_available (&opkg->conf->pkg_hash, all);
+ for (i = 0; i < all->len; i++)
{
- err = opkg_install_by_name (opkg->conf, package_id);
+ all->pkgs[i]->parent->dependencies_checked = 0;
}
+ pkg_vec_free (all);
+
+
+ /* 75% of "install" progress is for downloading */
+ opkg_package_free (pdata.package);
+ pdata.package = old_pkg_to_new (new);
+ pdata.action = OPKG_INSTALL;
+ progress (pdata, 75);
+
+ /* unpack the package */
+ 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)
{
/* XXX: Error: Package not installed. */
- return 1;
+ return OPKG_PACKAGE_NOT_INSTALLED;
}
pdata.action = OPKG_REMOVE;
if (pkg->state_status == SS_NOT_INSTALLED)
{
/* XXX: Error: Package seems to be not installed (STATUS = NOT_INSTALLED). */
- return 1;
+ return OPKG_PACKAGE_NOT_INSTALLED;
}
progress (pdata, 25);
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;
if (pkg == NULL)
{
/* XXX: Error: Package not installed in default_dest */
- return 1;
+ return OPKG_PACKAGE_NOT_INSTALLED;
}
}
else
if (!pkg)
{
/* XXX: Error: Package not installed */
- return 1;
+ return OPKG_PACKAGE_NOT_INSTALLED;
}
pdata.action = OPKG_INSTALL;
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;
opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callback, void *user_data)
{
char *tmp;
- int err;
+ int err, result = 0;
char *lists_dir;
pkg_src_list_elt_t *iter;
pkg_src_t *src;
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;
sprintf_alloc (&list_file_name, "%s/%s", lists_dir, src->name);
if (src->gzip)
{
- char *tmp_file_name;
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);
if (err)
{
/* XXX: Error: download error */
+ result = OPKG_DOWNLOAD_FAILED;
}
free (url);
else
sprintf_alloc (&url, "%s/%s", src->value, "Packages.sig");
- /* create temporary file for it */
- char *tmp_file_name;
+ /* create filename for signature */
+ sprintf_alloc (&sig_file_name, "%s/%s.sig", lists_dir, src->name);
- sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig");
+ /* make sure there is no existing signature file */
+ unlink (sig_file_name);
- err = opkg_download (opkg->conf, url, tmp_file_name, NULL, NULL);
+ 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);
free (tmp);
free (lists_dir);
- return 0;
+ /* Now re-read the package lists to update package hash tables. */
+ opkg_re_read_config_files (opkg);
+
+ return result;
}